From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 22 Apr 2010 09:29:19 +0000 (+0200)
Subject: Merge branch 'collectd-4.9'
X-Git-Tag: collectd-4.10.0~15
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=967a0fdefd43db0e4ed5f8cba65c3c345ef6cdfb;hp=5f3702fcc67d68d428708e9cf5e5897ad2578925;p=collectd.git

Merge branch 'collectd-4.9'
---

diff --git a/ChangeLog b/ChangeLog
index 191892d5..488487ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+2010-04-22, Version 4.9.2
+	* Build system, various plugins: Fixes for AIX compatibility have been
+	  added. Thanks to Manuel Sanmartin for his patches.
+	* Build system: Checking for "nanosleep" on old Solaris machines has
+	  been fixed. Thanks to Vincent McIntyre and Sebastian Harl for
+	  figuring out a way to make this work.
+	* collectd: Append a newline to messages written to STDERR.
+	* collectd: Serialization of NANs in JSON format has been fixed.
+	  Thanks to Chris Buben for pointing out the resulting syntax error.
+	* collectd: Checks whether a "sleep" returned early have been added;
+	  the cases are now handled correctly. Thanks to Michael Stapelberg
+	  for the patch.
+	* collectd: Continue reading files in a directory when parsing one
+	  file fails.
+	* apache plugin: Collection of the number of active connections has
+	  been fixed for Apache 2.*.
+	* contextswitch plugin: Handle large counter/derive values correctly.
+	  Thanks to Martin Merkel for reporting the bug.
+	* exec plugin: Error messages have been improved. The "running" flag
+	  is now cleared correctly when forking a child fails.
+	* iptables plugin: Fix a violation of aliasing rules. This resolves a
+	  warning / error with new GCC versions. Thanks to Jan Engelhardt for
+	  the work-around.
+	* java plugin: The Java API files are now packaged into a .jar file.
+	  Thanks to Amit Gupta for his patch.
+	* network plugin: Fix a segmentation fault when receiving packets with
+	  an unknown data source type.
+	* network plugin: A memory leak when receiving encrypted network
+	  packets has been fixed.
+	* openvpn plugin: Fix naming schema when reading "MULTI1" type status
+	  files.
+	* oracle plugin: Fix checking for lost connections and reconnect in
+	  this case. Thanks to Sven Trenkel for pointing out the problem.
+	* unixsock plugin: A memory leak in the "LISTVAL" command has been
+	  fixed. Thanks to Peter Warasin for pointing it out.
+	* write_http plugin: Use the "any" authentication schema. This used to
+	  be "digest". Thanks to Paul Sadauskas for the patch.
+
 2010-01-14, Version 4.9.1
 	* Documentation: Some manpage fixes.
 	* Default config: Added sample configuration for missing plugins.
@@ -52,6 +90,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 a84eddb4..2a93ab7b 100755
--- a/version-gen.sh
+++ b/version-gen.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DEFAULT_VERSION="4.8.4.git"
+DEFAULT_VERSION="4.9.2.git"
 
 VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"