From: Florian Forster <octo@noris.net>
Date: Mon, 5 May 2008 12:04:31 +0000 (+0200)
Subject: Merge branch 'ok/disk' into collectd-4.4
X-Git-Tag: collectd-4.4.0~18
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=ebdc9011b75c4c1478fbe02eb1cb9c69795288f9

Merge branch 'ok/disk' into collectd-4.4

Conflicts:

	configure.in
---

ebdc9011b75c4c1478fbe02eb1cb9c69795288f9
diff --cc configure.in
index 7e11fc8a,e94730d8..e95f99d6
--- a/configure.in
+++ b/configure.in
@@@ -2331,7 -2331,7 +2331,8 @@@ f
  # libstatgrab
  if test "x$with_libstatgrab" = "xyes"
  then
 +	plugin_cpu="yes"
+ 	plugin_disk="yes"
  	plugin_interface="yes"
  	plugin_load="yes"
  	plugin_memory="yes"