From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 4 Nov 2006 12:56:25 +0000 (+0100)
Subject: Merge branch 'collectd-3.10'
X-Git-Tag: collectd-3.11.0~61^2~1
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=dfe12aadb65933d7dd15d5e42d3c6218900bed15;hp=-c;p=collectd.git

Merge branch 'collectd-3.10'
---

dfe12aadb65933d7dd15d5e42d3c6218900bed15
diff --combined AUTHORS
index 9a35d036,178cf5c9..cde1d11a
--- a/AUTHORS
+++ b/AUTHORS
@@@ -4,7 -4,7 +4,7 @@@ This package was written by
  apcups plugin by:
    Anthony Gialluca <tonyabg at charter.net>
  
 -cpufreq module by:
 +cpufreq and multimeter module by:
    Peter Holik <peter at holik.at>
  
  hddtemp module by:
@@@ -41,6 -41,10 +41,10 @@@ contributed
  The `log' mode has been written by:
    Christophe Kalt <collectd at klb.taranis.org>
  
+ Much time and effort to find a nasty bug in the ntpd-plugin has been
+ contributed by:
+   Lubos Stanek <lubek at users.sourceforge.net>
+ 
  collectd is available at:
    <http://collectd.org/>
  
diff --combined configure.in
index 4c75f8c3,1e6de496..6d3698eb
--- a/configure.in
+++ b/configure.in
@@@ -1,5 -1,5 +1,5 @@@
  dnl Process this file with autoconf to produce a configure script.
- AC_INIT(collectd, 3.10.2)
+ AC_INIT(collectd, 3.10.3)
  AC_CONFIG_SRCDIR(src/collectd.c)
  AC_CONFIG_HEADERS(src/config.h)
  AM_INIT_AUTOMAKE(dist-bzip2)
@@@ -197,9 -197,6 +197,9 @@@ AC_CHECK_HEADERS(IOKit/storage/IOBlockS
  # For load module
  AC_CHECK_HEADERS(sys/loadavg.h)
  
 +# For the processes plugin
 +AC_CHECK_HEADERS(linux/config.h)
 +
  # For the swap module
  AC_CHECK_HEADERS(sys/swap.h)
  
@@@ -925,7 -922,6 +925,7 @@@ AC_COLLECTD([quota],     [enable],  [mo
  AC_COLLECTD([hddtemp],   [disable], [module], [hdd temperature statistics])
  AC_COLLECTD([load],      [disable], [module], [system load statistics])
  AC_COLLECTD([memory],    [disable], [module], [memory statistics])
 +AC_COLLECTD([multimeter],[disable], [module], [multimeter statistics])
  AC_COLLECTD([mysql],     [disable], [module], [mysql statistics])
  AC_COLLECTD([nfs],       [disable], [module], [nfs statistics])
  AC_COLLECTD([ntpd],      [disable], [module], [nfs statistics])
@@@ -973,7 -969,6 +973,7 @@@ Configuration
      hddtemp . . . . . . $enable_hddtemp
      load  . . . . . . . $enable_load
      memory  . . . . . . $enable_memory
 +    multimeter  . . . . $enable_multimeter
      mysql . . . . . . . $enable_mysql
      nfs . . . . . . . . $enable_nfs
      ntpd  . . . . . . . $enable_ntpd