Merge branch 'collectd-3.10' of octo@verplant.org:/var/lib/git/collectd into collectd...

diff --git a/ChangeLog b/ChangeLog
index 1ca0817..3c6fa29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-19, Version 3.10.1
+       * A bug in the apcups plugin was fixed: Is the plugin is loaded, but
+         the apcups cannot be reached, unconnected sockets will pile up and
+         eventually lead to `Too many open files' errors.
+
 2006-07-09, Version 3.10.0
        * The `disk' plugin has been ported to Darwin.
        * The `battery' plugin should work on many Apple computers now.

diff --git a/configure.in b/configure.in
index 75ad33f..f187cf3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(collectd, 3.10.0)
+AC_INIT(collectd, 3.10.1)
 AC_CONFIG_SRCDIR(src/collectd.c)
 AC_CONFIG_HEADERS(src/config.h)
 AM_INIT_AUTOMAKE(dist-bzip2)

diff --git a/debian/changelog b/debian/changelog
index 2765092..28b2e5e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+collectd (3.10.1-0octo1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Florian Forster <octo@verplant.org>  Wed, 19 Jul 2006 18:49:16 +0200
+
 collectd (3.10.0-1) unstable; urgency=low
 
   * New upstream version

diff --git a/src/apcups.c b/src/apcups.c
index 9117bda..f7486f5 100644 (file)
--- a/src/apcups.c
+++ b/src/apcups.c
@@ -208,6 +208,7 @@ static int net_open (char *host, char *service, int port)
        if (status != 0) /* `connect(2)' failed */
        {
                DBG ("connect failed: %s", strerror (errno));
+               close (sd);
                return (-1);
        }