Merge pull request #313 from tiwilliam/master

[collectd.git] / src / collectd.conf.in

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 3c4f239..fc9b10c 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -586,9 +586,11 @@
 #              Password "secret"
 #              Database "db_name"
 #              MasterStats true
+#              ConnectTimeout 10
 #      </Database>
 #
 #      <Database db_name2>
+#              Alias "squeeze"
 #              Host "localhost"
 #              Socket "/var/run/mysql/mysqld.sock"
 #              SlaveStats true