Merge branch 'collectd-4.1'

[collectd.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 3f16c8e..259f40c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+yyyy-mm-dd, Version 4.2.0
+       * snmp plugin: Added the options `Scale' and `Shift' to Data-blocks to
+         correct the values returned by SNMP-agents.
+
 yyyy-mm-dd, Version 4.1.2
        * apcups plugin: Fix reporting of the `load percent' data.
        * netlink plugin: Build issues under some older versions of the Linux