Merge branch 'collectd-4.8' into collectd-4.9

Conflicts:
	ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 191892d..c30e4bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,11 @@
        * scale target: This target to scale (multiply) values by an arbitrary
          value has been added.
 
+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 a84eddb..4f16366 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.9.1.git"
 
 VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"