collectd.conf: Updated for 5.5.1

diff --git a/debian/changelog b/debian/changelog
index 6e9e04f64d382c48cd37d87303dc4f992afdfeba..931760d7b3f51a90262027043f564bf738bfe5b9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ collectd (5.5.1-1) UNRELEASED; urgency=medium
       (Closes: #811580).
   * debian/patches:
     - Removed bts802249_varnish_41.patch; implemented upstream.
+  * debian/collectd.conf:
+    - Sync with upstream changes since 5.5.0.
 
  -- Marc Fournier <marc@bl.uem.li>  Fri, 22 Jan 2016 12:04:24 +0100
 

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 770a03425e9c08228199f33ba16f7a42196a75cf..cea1e59202e0b9f0f4f2f0a5555be835596addf3 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -284,7 +284,7 @@ LoadPlugin users
 
 #<Plugin battery>
 #      ValuesPercentage false
-#      ReportDegraded
+#      ReportDegraded false
 #</Plugin>
 
 #<Plugin bind>
@@ -464,7 +464,6 @@ LoadPlugin users
        IgnoreSelected true
 
 #      ReportByDevice false
-#      ReportReserved false
 #      ReportInodes false
 
 #      ValuesAbsolute true
@@ -558,6 +557,7 @@ LoadPlugin users
 
 #<Plugin iptables>
 #      Chain "table" "chain"
+#      Chain6 "table" "chain"
 #</Plugin>
 
 #<Plugin irq>