Merge branch 'collectd-4.1'

[collectd.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 928cc8d..d25d3cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+yyyy-mm-dd, Version 4.2.0
+       * collectd: The new config option `Include' lets you include other
+         configfiles and thus split up your config into smaller parts. This
+         may be especially interresting for the snmp plugin to keep the data
+         definitions seperate from the host definitions.
+       * snmp plugin: Added the options `Scale' and `Shift' to Data-blocks to
+         correct the values returned by SNMP-agents.
+
 2007-09-28, Version 4.1.2
        * apcups plugin: Fix reporting of the `load percent' data.
        * wireless plugin: Correct the handling of cards returning signal and