From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 31 Mar 2007 06:09:50 +0000 (+0200)
Subject: Merge branch 'collectd-3.11'
X-Git-Tag: collectd-4.0.0~88^2~1
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=1e7a1563af4e3a82e2f2e017dcabe9616624175d;p=collectd.git

Merge branch 'collectd-3.11'

Conflicts:

	ChangeLog
---

1e7a1563af4e3a82e2f2e017dcabe9616624175d
diff --cc ChangeLog
index 66c1fc1d,b97383b2..5fac3d65
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,7 +1,10 @@@
 +	* apache plugin: Support for lighttpd's `BusyServers' (aka.
 +	connections) field was added by Florent Monbillard.
 +
+ 2007-03-30, Version 3.11.3
+ 	* configure: Have the configure-script define `HAVE_LIBKSTAT' instead
+ 	  of the unused `COLLECT_KSTAT'.
+ 
  2007-02-11, Version 3.11.2
  	* plugin: Catch NULL-pointer and try to fix them. Otherwise the
  	  NULL-pointer may have been passed to `printf' which causes a