Bumped version to 4.8.5; Updated ChangeLog.

diff --git a/ChangeLog b/ChangeLog
index 055da8642ba072d4e0f142acad2f525159d9dd97..823ec0edc42fe49905cb31f38d1b27d4892f19ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-22, Version 4.8.5
+       * collectd: Append a newline to messages written to STDERR.
+       * network plugin: Fix a segmentation fault when receiving packets with
+         an unknown data source type.
+
 2010-04-07, Version 4.8.4
        * Build system, various plugins: Fixes for AIX compatibility have been
          added. Thanks to Manuel Sanmartin for his patches.

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