From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 15 Sep 2007 09:01:59 +0000 (+0200)
Subject: Merge branch 'collectd-4.1'
X-Git-Tag: collectd-4.2.0~59
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7ca2b1a1627d7fd14348247c846d6f10342a70d5;p=collectd.git

Merge branch 'collectd-4.1'
---

7ca2b1a1627d7fd14348247c846d6f10342a70d5
diff --cc ChangeLog
index 74d2a0a8,3f16c8ef..259f40c3
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,7 +1,11 @@@
 +yyyy-mm-dd, Version 4.2.0
 +	* 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
  	* apcups plugin: Fix reporting of the `load percent' data.
+ 	* netlink plugin: Build issues under some older versions of the Linux
+ 	  includes (i. e. Debian Sarge) have been fixed.
  
  2007-09-12, Version 4.1.1
  	* Build system: The detection of `libnetlink' has been improved.