From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 27 Dec 2007 10:15:30 +0000 (+0100)
Subject: Merge branch 'collectd-4.1' into collectd-4.2
X-Git-Tag: collectd-4.2.3~7
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=1a8ae6734a9351097943dd1ce019a8d95b72c3d1;p=collectd.git

Merge branch 'collectd-4.1' into collectd-4.2

Conflicts:

	ChangeLog
	version-gen.sh
---

1a8ae6734a9351097943dd1ce019a8d95b72c3d1
diff --cc ChangeLog
index c7e95e98,74a13e05..947cdcee
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,43 -1,9 +1,49 @@@
 +2007-12-15, Version 4.2.2
 +	* nginx plugin: Incorrect comparison of strings lead to a segfault
 +	  when using the plugin. Thanks to Saulius Grigaliunas for fixing
 +	  this.
 +	* logfile plugin: The config option `Timestamp' was handled
 +	  incorrectly and basically always active. Thanks to Luke Heberling
 +	  for fixing this.
 +
 +2007-11-08, Version 4.2.1
 +	* tcpconns plugin: Don't complain about a missing file if IPv6 is not
 +	  enabled on the host.
 +	* snmp plugin: Fix a memory leak.
 +
 +2007-10-27, Version 4.2.0
 +	* collectd: The new config option `Include' lets you include other
 +	  configfiles and thus split up your config into smaller parts. This
 +	  may be especially interesting for the snmp plugin to keep the data
 +	  definitions separate from the host definitions.
 +	* ipvs plugin: The new `ipvs' plugin collects IPVS connection statistics
 +	  (number of connections, octets and packets for each service and
 +	  destination). Thanks to Sebastian Harl for this plugin.
 +	* memcached plugin: The new `memcached' plugin connects to a memcached
 +	  daemon process and collects statistics of this distributed caching
 +	  system. Thanks to Antony Dovgal for contributing this plugin.
 +	* nginx plugin: The new `nginx' plugin reads the status page of an
 +	  nginx daemon and saves the handled connections and requests.
 +	* perl plugin: Many changes, including the added `EnableDebugger'
 +	  config option which lets you debug your Perl plugins more easily.
 +	* rrdtool plugin: Use the thread-safe RRD-library if available. Try to
 +	  be more thread-safe otherwise by locking calls to the library.
 +	* snmp plugin: Added the options `Scale' and `Shift' to Data-blocks to
 +	  correct the values returned by SNMP-agents. If a <data> block is
 +	  defined as `table' the instance is now optional. The sequence number
 +	  is used as the type-instance in this case. The new `InstancePrefix'
 +	  option allows to add arbitrary prefixes to the type-instance.
 +	* tcpconns plugin: The new `tcpconns' plugin collects the number of
 +	  certain TCP connections and what state they're in. This can be used
 +	  to see how many connections your FTP server has to handle or how
 +	  many outgoing connections your mailserver has open.
 +
+ 2007-12-27, Version 4.1.5
+ 	* rrdtool plugin: Fix a memory leak that only occured in very-low-
+ 	  memory situations.
+ 	* sensors plugin: Updated the plugin to build and work with version 3
+ 	  of the libsensors library.
+ 
  2007-11-08, Version 4.1.4
  	* Build system: Improve detection of the rrd library, especially if
  	  it's in a non-standard location.