Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
	ChangeLog
	version-gen.sh

diff --git a/ChangeLog b/ChangeLog
index 45f2209..b5e033f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,6 +61,14 @@
        * uptime plugin: The new uptime plugin can collect the server's
          uptime. Thanks to Marco Chiappero for the patch.
 
+2009-07-18, Version 4.6.4
+       * collectd: Okay-notifications have been fixed. Thanks to Andrés J.
+         Díaz for fixing this bug.
+       * collectd: A programming error has been fixed in the notification
+         code. The bug may result in an assertion failure.
+       * memcached plugin: Portability fix for Solaris. Thanks to Amit Gupta
+         for reposting the bug.
+
 2009-06-02, Version 4.6.3
        * Build system, various plugins: Many build fixes for FreeBSD,
          OpenBSD, NetBSD, Solaris and Mac OS X. Big thanks to Doug MacEachern