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

[Florian Forster]

 ChangeLog        |    4 ++++
 debian/changelog |    6 ++++++
 src/utils_dns.c  |   13 +++++++------
 3 files changed, 17 insertions(+), 6 deletions(-)

New commits:
commit 06adec208286b5a136ffa5c5f3832c35e9f62844
Merge: a432a981a00224528dcba09f82cc85f1fe58d9a4 bb743c17dda8f0c51828c62a7b8ec98bdaa9bfcf
Author: Florian Forster <octo.trailing-username(a)leading-domain.leeloo.lan.home.verplant.org>
Date:   Tue Apr 10 17:23:13 2007 +0200

    Merge branch 'master' into collectd-4
    
    Conflicts:
    
    	configure.in

commit bb743c17dda8f0c51828c62a7b8ec98bdaa9bfcf
Merge: 1e7a1563af4e3a82e2f2e017dcabe9616624175d 84fa07ad0de81d0b1521e4badacde74a4af238c1
Author: Florian Forster <octo.trailing-username(a)leading-domain.leeloo.lan.home.verplant.org>
Date:   Tue Apr 10 17:21:49 2007 +0200

    Merge branch 'collectd-3.11'
    
    Conflicts:
    
    	ChangeLog

commit 84fa07ad0de81d0b1521e4badacde74a4af238c1
Author: Florian Forster <octo.trailing-username(a)leading-domain.leeloo.lan.home.verplant.org>
Date:   Tue Apr 10 17:19:09 2007 +0200

    Bumped version to 3.11.4; Updated ChangeLog.

commit f99d65ce60f444e12182215205c698c9d7885c2e
Author: Florian Forster <octo.trailing-username(a)leading-domain.leeloo.lan.home.verplant.org>
Date:   Tue Apr 10 17:09:09 2007 +0200

    src/utils_dns.c: Include `sys/socket.h' before `net/if_arp.h'.

commit bd4c3492dc5bc790d336ef3f794c72042e665a2d
Author: Florian Forster <octo.trailing-username(a)leading-domain.leeloo.lan.home.verplant.org>
Date:   Tue Apr 10 17:08:09 2007 +0200

    configure.in: Improved the checks for `net/if_arp.h' and `netinet/if_ether.h'.