Merge branch 'collectd-3.9'

diff --git a/ChangeLog b/ChangeLog
index 934648211dbae23f573b5ea9ca71142e9f0d05b5..0e3c7a78d28d12e833af8ef9579b997f4bb3647a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,14 @@
        * A plugin for moniroting an NTP instance and the local clock drift
          has been added.
 
+2006-06-18, Version 3.9.4
+       * The Solaris code in the `swap' plugin has been changed to reflect
+         the numbers returned by `swap -s'. Thanks to Christophe Kalt for
+         working this out.
+       * The debugging system has been fixed to work with the Sun libc.
+       * When built without librrd the variable `operating_mode' could be
+         uninitialized. Thanks to David Elliot for reporting the bug.
+
 2006-06-01, Version 3.9.3
        * Fixed the ping-plugin under FreeBSD and Mac OS X. Potentially other
          operating systems also profit from the changes, but I wasn't able to

diff --git a/collectd.spec b/collectd.spec
index 0012e19c479eca809ccc9e7da14e28aed63dde51..aea8a3f5b03fb2544e123313c4b3e7990ebb4274 100644 (file)
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,6 +1,6 @@
 Summary:       Statistics collection daemon for filling RRD files.
 Name:           collectd
-Version:       3.9.3
+Version:       3.9.4
 Release:       1
 Source:                http://collectd.org/files/%{name}-%{version}.tar.gz
 License:       GPL
@@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0444,root,root) %{_libdir}/%{name}/sensors.so*
 
 %changelog
+* Tue Jun 18 2006 Florian octo Forster <octo@verplant.org> 3.9.4-1
+- New upstream version
+
 * Tue Jun 01 2006 Florian octo Forster <octo@verplant.org> 3.9.3-1
 - New upstream version
 

diff --git a/debian/changelog b/debian/changelog
index 9ea2758b37464331c58aa82bdcd931515d22596f..4e5bd89a39e34a606b010311315bc71c1f0579ef 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+collectd (3.9.4) unstable; urgency=low
+
+  * New upstream version 
+
+ -- Florian Forster <octo@leeloo.home.verplant.org>  Sun, 18 Jun 2006 19:50:44 +0200
+
 collectd (3.9.3) unstable; urgency=low
 
   * New upstream version 

diff --git a/src/collectd.c b/src/collectd.c
index 2720590e22ab8b4d3bb18d4ac3f149982511aa54..0d9c90fce19a5dd2fe1e222c8a61f3d07e63a67d 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -291,6 +291,8 @@ int main (int argc, char **argv)
 
 #if HAVE_LIBRRD
        operating_mode = MODE_LOCAL;
+#else
+       operating_mode = MODE_CLIENT;
 #endif
 
        /* open syslog */