From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 12 Oct 2007 16:59:29 +0000 (+0200)
Subject: Merge branch 'collectd-4.1'
X-Git-Tag: collectd-4.2.0~27
X-Git-Url: https://git.tokkee.org/?p=collectd.git;a=commitdiff_plain;h=83149d73b8a3bd4889517a2e4d0adca0a52e7a06

Merge branch 'collectd-4.1'

Conflicts:

	ChangeLog
---

83149d73b8a3bd4889517a2e4d0adca0a52e7a06
diff --cc ChangeLog
index ac5e78c1,099a5ca4..24dc6908
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,15 -1,5 +1,21 @@@
 +yyyy-mm-dd, 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 interresting for the snmp plugin to keep the data
 +	  definitions seperate from the host definitions.
 +	* perl plugin: Many changes, including the added `EnableDebugger'
 +	  config option which lets you debug your Perl plugins more easily.
 +	* snmp plugin: Added the options `Scale' and `Shift' to Data-blocks to
 +	  correct the values returned by SNMP-agents.
 +	* ipvs plugin: The new `ipvs' plugin collects IPVS connection statistics
 +	  (number of connections, octets and packets for each service and
 +	  destination).
++	* rrdtool plugin: Use the threadsafe RRD-library if available. Try to
++	  be more threadsafe otherwise by locking calls to the library.
++
++yyyy-mm-dd, Version 4.1.3
+ 	* rrdtool plugin: Use the threadsafe RRD-library if available. Try to
+ 	  be more threadsafe otherwise by locking calls to the library.
  
  2007-09-28, Version 4.1.2
  	* apcups plugin: Fix reporting of the `load percent' data.