From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 12 Sep 2007 09:15:54 +0000 (+0200)
Subject: Merge branch 'collectd-4.0' into collectd-4.1
X-Git-Tag: collectd-4.1.1~1
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=90ac9957e95378d729bce1c00bb0ef2efadab33e;p=collectd.git

Merge branch 'collectd-4.0' into collectd-4.1

Conflicts:

	ChangeLog
	configure.in
---

90ac9957e95378d729bce1c00bb0ef2efadab33e
diff --cc ChangeLog
index 30564d5f,0a0b1935..0fad3c8b
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,35 -1,12 +1,47 @@@
- 2007-09-10, Version 4.1.1
++2007-09-12, Version 4.1.1
 +	* Build system: The detection of `libnetlink' has been improved.
 +	* collectd: The documentation has been fixed in numerous places.
 +	* exec plugin: Setting the group under which to run a program has been
 +	  fixed.
++	* collectd: The `sstrerror' function was improved to work correctly
++	  with the broken GNU version of `strerror_r'.
++	* collectd: Write an error message to STDERR when loading of a plugin
++	  fails.
++	* apcups plugin: Fix the `types' used to submit the values: They still
++	  has an `apcups_' prefix which doesn't work anymore.
++	* rrdtool plugin: Create new RRD-files with the `begin' time set to
++	  whatever the client thinks is `now'..
 +
 +2007-09-01, Version 4.1.0
 +	* Build system: The build system has been changed to automatically
 +	  disable all plugins, which are missing dependencies. The dependency
 +	  checking has been removed from the plugins themselves to remove
 +	  redundancy.
 +	* Flexible interval: The interval of collected data is now sent along
 +	  with the data itself over the network, so that the interval-settings
 +	  of server and clients no longer needs to match.
 +	* netlink plugin: The new `netlink' plugin connects to the Linux
 +	  kernel using a netlink socket and uses it to query information about
 +	  interfaces, qdiscs and classes.
 +	* rrdtool plugin: The cache is now dumped to disk in an extra thread
 +	  to not block data collection.
 +	* snmp plugin: The new `snmp' plugin can read values from SNMP enabled
 +	  network devices, such as switches, routers, thermometers, rack
 +	  monitoring servers, etc. The collectd-snmp(5) manpage documents this
 +	  plugin.
 +	* unixsock plugin: Added the `LISTVAL' command.
 +	* xmms plugin: The new `xmms' plugin graphs the bitrate and frequency
 +	  of music played with xmms.
 +
- 2007-09-10, Version 4.0.8
+ 2007-09-12, Version 4.0.8
  	* collectd: The `sstrerror' function was improved to work correctly
  	  with the broken GNU version of `strerror_r'.
+ 	* collectd: Write an error message to STDERR when loading of a plugin
+ 	  fails.
  	* apcups plugin: Fix the `types' used to submit the values: They still
  	  has an `apcups_' prefix which doesn't work anymore.
+ 	* rrdtool plugin: Create new RRD-files with the `begin' time set to
+ 	  whatever the client thinks is `now'..
  
  2007-08-26, Version 4.0.7
  	* documentation: Some typos have been fixed and some information has