[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 ChangeLog        |    5 +++++
 configure.in     |    2 +-
 debian/changelog |    6 ++++++
 src/apcups.c     |    1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit df6f5e387b589b665f3be9099f6a27a84a805e09
Merge: 5ea76bea7a7e7d53960c90779f744830f76adb3e be7450d5e6e384c1f7ef7628e5ea27e77afbb582
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Jul 19 18:52:20 2006 +0200

    Merge branch 'master' of /var/lib/git/collectd

commit 5ea76bea7a7e7d53960c90779f744830f76adb3e
Merge: 6f5f56a90d63d48bf8d4b11f071a868eb27932b7 8a94ccd77411761bc33dd5c163f36eb4c954237f
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Jul 19 18:51:35 2006 +0200

    Merge branch 'collectd-3.10'

commit 8a94ccd77411761bc33dd5c163f36eb4c954237f
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Jul 19 18:50:21 2006 +0200

    Bumped version to 3.10.1; Updated ChangeLog.

commit 90e12ab9258573aa46651640ecdbfaf24812068e
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Jul 19 18:41:36 2006 +0200

    apcups plugin: Close the socket when `connect' failes.
    
    Otherwise people will get `Too many open files' faily soon.

commit 6f5f56a90d63d48bf8d4b11f071a868eb27932b7
Merge: ab133a8aad6220c9ba6168ad593f5dc7870d4d10 02ef3090232f10a86e8f52597e42495a468bb3c5
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Sun Jul 16 15:35:22 2006 +0200

    Merge branch 'master' of /var/lib/git/collectd

commit ab133a8aad6220c9ba6168ad593f5dc7870d4d10
Merge: 8be78ba8117ff66b215f76076df75956b0fec6d2 99c778e7555fc522ca6bd7ed6f96cd80a774a7fa
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jul 11 14:07:41 2006 +0200

    Merge branch 'processes' of /var/lib/git/collectd