From: octo <octo>
Date: Thu, 1 Jun 2006 20:53:20 +0000 (+0000)
Subject: octo@leeloo:~/collectd $ svn merge -r773:777 branches/collectd-3.9 trunk
X-Git-Tag: svn-trunk~17
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a9a298a54644fc7f88b0eed31357706ac5912fdd;p=collectd.git

octo@leeloo:~/collectd $ svn merge -r773:777 branches/collectd-3.9 trunk
---

a9a298a54644fc7f88b0eed31357706ac5912fdd
diff --cc ChangeLog
index 326926cc,871acf09..5d421db4
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,10 +1,15 @@@
 +	* 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.
 +
+ 2006-06-01, Version 3.9.3
+ 	* Fixed the ping-plugin under FreeBSD and Mac OS X. Potentially other
+ 	  operating systems also profit from the changes, but I wasn't able to
+ 	  check that.
+ 	* Changed the build system to find the netinet-includes under FreeBSD
+ 	  and therefore successfully build the `liboping' library there.
+ 
  2006-05-09, Version 3.9.2
  	* Applied a patch to the `liboping' library. Due to a bug in the
  	  sequence checking the `ping' plugin stopped working after