From: Florian Forster <octo@collectd.org>
Date: Sun, 5 Feb 2012 13:02:07 +0000 (+0100)
Subject: Bump version to 4.10.6; Update ChangeLog.
X-Git-Tag: collectd-4.10.6~5
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=de30ad2d568880e64532cbafc48d76c7a25fde6b;p=collectd.git

Bump version to 4.10.6; Update ChangeLog.

Change-Id: I95bfb6e742ba7ad9e2b9c89dc990cd4bf573dbfa
---

diff --git a/ChangeLog b/ChangeLog
index c61a669d..50ae5c21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2012-02-05, Version 4.10.6
+	* Build system: Fix problems when building the ipvs and iptables
+	  plugins. Thanks to Sebastian Harl for his patch. A bashism in the
+	  version-gen.sh script has been fixed. Thanks to Jo-Philipp Wich for
+	  his patch.
+	* csv and rrdtool plugins: Print a more helpful error message when the
+	  DataDir is a symlink pointing to a non-existing location. Thanks to
+	  Jonathan Nieder for his patch.
+	* oracle plugin: A potential endless loop in the error handling has
+	  been fixed.
+	* python plugin: A crash bug in the configuration handling has been
+	  fixed. Thanks to Sven Trenkel for his patch.
+	* interfaces plugin: The change which was supposed to ignore "bogus"
+	  interfaces has been reverted, since it ignored legit interfaces, such
+	  as bonding pseudo-devices as well.
+
 2012-01-21, Version 4.10.5
 	* curl_xml plugin: Fix handling of file:// and other URLs (which don't
 	  follow HTTP status codes). Thanks to Fabien Wernli for his patch!
diff --git a/version-gen.sh b/version-gen.sh
index 1d5416ba..386a1c1c 100755
--- a/version-gen.sh
+++ b/version-gen.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-DEFAULT_VERSION="4.10.5.git"
+DEFAULT_VERSION="4.10.6.git"
 
 VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"