Merge pull request #827 from yogeswaran/collectdctl

collectdctl command hangs on AIX and returns error 0 on Solaris.

diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec
index d561dc3..38711a2 100644 (file)
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@ -189,7 +189,7 @@ Source:             http://collectd.org/files/%{name}-%{version}.tar.bz2
 License:       GPLv2
 Group:         System Environment/Daemons
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libgcrypt-devel, kernel-headers
+BuildRequires: libgcrypt-devel, kernel-headers, libtool-ltdl-devel
 Vendor:                collectd development team <collectd@verplant.org>
 
 Requires(post):                chkconfig

diff --git a/src/cpu.c b/src/cpu.c
index 1c4e5f6..6753397 100644 (file)
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -156,8 +156,6 @@ static int init (void)
 
        DEBUG ("host_processors returned %i %s", (int) cpu_list_len, cpu_list_len == 1 ? "processor" : "processors");
        INFO ("cpu plugin: Found %i processor%s.", (int) cpu_list_len, cpu_list_len == 1 ? "" : "s");
-
-       cpu_temp_retry_max = 86400 / CDTIME_T_TO_TIME_T (plugin_get_interval ());
 /* #endif PROCESSOR_CPU_LOAD_INFO */
 
 #elif defined(HAVE_LIBKSTAT)