Bump version to 4.10.5; Update ChangeLog.

Change-Id: I900278064970e0c2d2bf471f4f80c7672aa8211f

diff --git a/AUTHORS b/AUTHORS
index 45689652ab1eb1fbfc3df8c2677434d924212c57..f090840e0a48856b7ce2dbeb3a51d28aac467d8f 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -63,6 +63,9 @@ Edward “Koko” Konetzko <konetzed at quixoticagony.com>
 Fabian Linzberger <e at lefant.net>
  - Percentage aggregation for `collectd-nagios'.
 
+Fabien Wernli <cpan at faxm0dem.org>
+ - Solaris improvements in the memory and interfaces plugin.
+
 Flavio Stanchina <flavio at stanchina.net>
  - mbmon plugin.
 

diff --git a/ChangeLog b/ChangeLog
index e93936fb5e1aef0f0460a1a207db0b7857d51e28..1f9be512e4b0305cf44aeb05cb96838b0946d1e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+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!
+       * df plugin: Fix handling of negative "available" counts. This can
+         occur with some file systems, for example UFS. Thanks to Toni Ylenius
+         for his patch.
+       * interface plugin: "mac" interfaces are now ignored on Solaris. These
+         pseudo-interfaces occur multiple times, causing warnings. Also switch
+         to 64-bit counters on Solaris, improving overflow behavior for
+         high-speed interfaces. Thanks to Eddy Geez and Fabien Wernli for
+         their patches.
+       * memory plugin: Account kernel and unused memory under Solaris. Thanks
+         to Fabien Wernli for his patch.
+       * network plugin: A bug in the interaction between the Network plugin
+         and filter chains has been fixed: When a filter modified a field such
+         as the hostname, subsequent values in the same network packets could
+         have ended up using the modified name rather than the original name.
+         Thanks to Sebastian Harl for identifying the problem.
+       * python plugin: A memory leak has been fixed. Thanks to Sven Trenkel
+         for fixing this bug!
+
 2011-10-14, Version 4.10.4
        * collectd: A mutex leak has been fixed in the meta data code. Thanks
          to Rafal Lesniak for his patch.

diff --git a/version-gen.sh b/version-gen.sh
index 3baa6f82dec5443dbcfc18b29cd0defceb6491ec..2223ff956cfad1873d47231ce62e568b8756c82b 100755 (executable)
--- a/version-gen.sh
+++ b/version-gen.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DEFAULT_VERSION="4.10.4.git"
+DEFAULT_VERSION="4.10.5.git"
 
 VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"