Merge branch 'collectd-4.0' into collectd-4.1

[collectd.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 0fad3c8..66d339d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+yyyy-mm-dd, Version 4.1.2
+       * apcups plugin: Fix reporting of the `load percent' data.
+
 2007-09-12, Version 4.1.1
        * Build system: The detection of `libnetlink' has been improved.
        * collectd: The documentation has been fixed in numerous places.
@@ -33,6 +36,9 @@
        * xmms plugin: The new `xmms' plugin graphs the bitrate and frequency
          of music played with xmms.
 
+yyyy-mm-dd, Version 4.0.9
+       * apcups plugin: Fix reporting of the `load percent' data.
+
 2007-09-12, Version 4.0.8
        * collectd: The `sstrerror' function was improved to work correctly
          with the broken GNU version of `strerror_r'.