Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
	ChangeLog

Change-Id: I65f02dbcad46460f18f356bc8d32eb15a7a352c2

diff --git a/ChangeLog b/ChangeLog
index 504e948..8ea965e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -98,10 +98,11 @@
        * v5upgrade target: Target for converting v4 data sets to the v5
          schema.
 
-2011-10-07, Version 4.10.4
+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.
-       * collectd: Compatibility fixes for GCC 4.6 have been applied.
+       * collectd: Compatibility fixes for GCC 4.6 have been applied. Thanks
+         to Peter Green for his patch.
        * csv plugin: The line buffer size has been increased. Thanks to Colin
          McCabe for the patch.
        * curl_json plugin: Don't use the "parent" node to build the type