From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 28 Sep 2007 14:40:06 +0000 (+0200)
Subject: Merge branch 'collectd-4.1'
X-Git-Tag: collectd-4.2.0~56
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=0fbdd776a6d9203939d6c85139768adf2725059c;p=collectd.git

Merge branch 'collectd-4.1'

Conflicts:

	ChangeLog
---

0fbdd776a6d9203939d6c85139768adf2725059c
diff --cc ChangeLog
index 49e6c31b,928cc8d0..d25d3cbe
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,15 -1,13 +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.
 +	* snmp plugin: Added the options `Scale' and `Shift' to Data-blocks to
 +	  correct the values returned by SNMP-agents.
 +
- yyyy-mm-dd, Version 4.1.2
+ 2007-09-28, Version 4.1.2
  	* apcups plugin: Fix reporting of the `load percent' data.
+ 	* wireless plugin: Correct the handling of cards returning signal and
+ 	  noise quality as percentage.
+ 	* perl plugin: Fix a possible buffer overflow in get_module_name().
+ 	* build system: Further improve the detection of libraries.
  	* netlink plugin: Build issues under some older versions of the Linux
  	  includes (i. e. Debian Sarge) have been fixed.
+ 	* snmp plugin: Fix a potential segfault when a host times out. Add
+ 	  support for the `timeticks' type. 
  
  2007-09-12, Version 4.1.1
  	* Build system: The detection of `libnetlink' has been improved.