From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 22 Apr 2010 09:06:16 +0000 (+0200)
Subject: Bumped version to 4.8.5; Updated ChangeLog.
X-Git-Tag: collectd-4.8.5^0
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6bbd2007deb393cffa3502902c1bd81c49328d33;p=collectd.git

Bumped version to 4.8.5; Updated ChangeLog.
---

diff --git a/ChangeLog b/ChangeLog
index 055da864..823ec0ed 100644
--- 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 4d00d32e..ec54a508 100755
--- 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-//'`"