From: octo <octo>
Date: Sun, 14 May 2006 14:43:05 +0000 (+0000)
Subject: Merged stuff from branches/collectd-3.9: After release 3.9.2 the ChangeLog additions... 
X-Git-Tag: svn-trunk~29
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=54ab766f15c5eaf404885ce6a2943f05fadec150;p=collectd.git

Merged stuff from branches/collectd-3.9: After release 3.9.2 the ChangeLog additions were not copied..
---

54ab766f15c5eaf404885ce6a2943f05fadec150
diff --cc ChangeLog
index a60bce1f,6a5f3eab..326926cc
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,8 +1,18 @@@
 +	* 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-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
+ 	  approximately 7.6 days.
+ 
 +2006-05-09, Version 3.8.5
 +	* Applied a patch to the `liboping' library. Due to a bug in the
 +	  sequence checking the `ping' plugin stopped working after
 +	  approximately 7.6 days.
 +
  2006-04-21, Version 3.9.1
  	* Build issues with Solaris and possible other architectures have been
  	  resolved.
diff --cc debian/changelog
index 8c1be960,38cab468..d346c732
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ collectd (3.9.2-1) unstable; urgency=low
+ 
+   * New upstream version
+ 
+  -- Florian Forster <octo@verplant.org>  Tue,  9 May 2006 11:12:00 +0200
+ 
 +collectd (3.8.5-1) unstable; urgency=low
 +
 +  * New upstream version
 +
 + -- Florian Forster <octo@verplant.org>  Tue,  9 May 2006 10:56:00 +0200
 +
  collectd (3.9.1-1) unstable; urgency=low
  
    * New upstream version