From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 25 Jun 2006 17:42:08 +0000 (+0200)
Subject: Merge branch 'collectd-3.9'
X-Git-Tag: collectd-3.10.0~17
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7f5ff3b714225c6288a29a042d7021e6fe318110;p=collectd.git

Merge branch 'collectd-3.9'
---

7f5ff3b714225c6288a29a042d7021e6fe318110
diff --cc ChangeLog
index 0e3c7a78,bfca172e..0a181fe9
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,4 +1,14 @@@
 +	* The `disk' plugin has been ported to Darwin.
 +	* The `battery' plugin should work on many Apple computers now.
 +	* The `traffic' plugin can now ignore certain interfaces. Also,
 +	  statistics for sent/received packets and errors have been added.
 +	* A plugin to monitor APC UPSes using `apcupsd' has been added. Thanks
 +	  to Anthony Gialluca for contributing this plugin and providing me
 +	  with a test environment :)
 +	* A plugin for moniroting an NTP instance and the local clock drift
 +	  has been added.
 +
- 2006-06-18, Version 3.9.4
+ 2006-06-25, Version 3.9.4
  	* The Solaris code in the `swap' plugin has been changed to reflect
  	  the numbers returned by `swap -s'. Thanks to Christophe Kalt for
  	  working this out.