Merge branch 'collectd-4.1' into collectd-4.2

Conflicts:

	ChangeLog
	contrib/PerlLib/Collectd.pm
	version-gen.sh

diff --git a/ChangeLog b/ChangeLog
index ca0b034ac7953adc1bfdda8d6e96cd642fecc511..526d463dedfc678d7b09e342f7ea1e7975447dd9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,16 @@
          to see how many connections your FTP server has to handle or how
          many outgoing connections your mailserver has open.
 
+2007-11-08, Version 4.1.4
+       * Build system: Improve detection of the rrd library, especially if
+         it's in a non-standard location.
+       * Build system: A bug when parsing the argument for
+         `--with-libnetsnmp' has been fixed.
+       * collectd: Implement `strerror_r' if the libc doesn't provide it.
+       * rrdtool plugin: Fix a bug in the shutdown sequence that might cause
+         a deadlock or delay when shutting down the daemon.
+       * snmp plugin: Fix a memory leak.
+
 2007-10-24, Version 4.1.3
        * collectd: A build issue under Solaris has been resolved by renaming
          data types.