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

[Florian Forster]

 ChangeLog        |    5 +++++
 configure.in     |    2 +-
 debian/changelog |    6 ++++++
 src/collectd.c   |   19 +++++++++++++++----
 src/network.c    |    3 ++-
 5 files changed, 29 insertions(+), 6 deletions(-)

New commits:
commit e913f3f6b71b0ba4abd6aaf2202100a5cef48b75
Merge: 02c24d0cd1860a7af773671af356e86fd6b9cac8 6f8769a51a656fb136319ddc5e1d0ec7864ce510
Author: Florian Forster <octo.trailing-username(a)leading-domain.leeloo.lan.home.verplant.org>
Date:   Thu Dec 21 20:40:49 2006 +0100

    Merge branch 'collectd-3.10'
    
    Conflicts:
    
    	ChangeLog

commit 6f8769a51a656fb136319ddc5e1d0ec7864ce510
Author: Florian Forster <octo.trailing-username(a)leading-domain.leeloo.lan.home.verplant.org>
Date:   Thu Dec 21 20:37:02 2006 +0100

    Bumped version to 3.10.4; Updated ChangeLog.

commit f763c933f11eeb07d4a159fc711190434439eef4
Author: Florian Forster <octo.trailing-username(a)leading-domain.huhu.verplant.org>
Date:   Thu Dec 21 13:38:52 2006 +0100

    Bug#404018: Close the file descriptor when binding to a socket fails.
    
    This closes the second part of the bug reported by Max Kellermann.

commit 84f4eefa0e9e628b9d507321aacb3f0532b7c3d2
Author: Florian Forster <octo.trailing-username(a)leading-domain.huhu.verplant.org>
Date:   Thu Dec 21 13:27:56 2006 +0100

    Bug#404018: Break out of the `while (loop)'-loop when no socket can be opened.
    
    This fixes the first part of the bug reported by Max Kellermann.