Bumped version to 4.6.4; Updated ChangeLog.

diff --git a/ChangeLog b/ChangeLog
index c6e3f7c25c2dce6f36c5d926c199e7206e1d3e4c..92003a21cc80d8e42a5046a5f7b41758d03b02a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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

diff --git a/version-gen.sh b/version-gen.sh
index 4d1f2ed32af91af53c94cbfba448c704ae04b1d5..09050565c96ddc3d7e37c681c766d042e10caaee 100755 (executable)
--- a/version-gen.sh
+++ b/version-gen.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DEFAULT_VERSION="4.6.3.git"
+DEFAULT_VERSION="4.6.4.git"
 
 VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"