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

[Florian Forster]

 ChangeLog        |    4 ++++
 configure.in     |    9 +++------
 debian/changelog |    6 ++++++
 3 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit dc80c73c20ef0e69c3850fd9679a827ad79e61a1
Merge: 0352eb93e70fb471d4975823db38147d2661f4bf 1e7a1563af4e3a82e2f2e017dcabe9616624175d
Author: Florian Forster <octo.trailing-username(a)leading-domain.leeloo.lan.home.verplant.org>
Date:   Sat Mar 31 08:12:22 2007 +0200

    Merge branch 'master' into collectd-4
    
    Conflicts:
    
    	src/iptables.c

commit 1e7a1563af4e3a82e2f2e017dcabe9616624175d
Merge: 05f37b50e75f25b66bafca0ff6af1c496b6eb01d 005b6639a65a4c4c4dc08d75b10862901e75b9da
Author: Florian Forster <octo.trailing-username(a)leading-domain.leeloo.lan.home.verplant.org>
Date:   Sat Mar 31 08:09:50 2007 +0200

    Merge branch 'collectd-3.11'
    
    Conflicts:
    
    	ChangeLog

commit 005b6639a65a4c4c4dc08d75b10862901e75b9da
Author: Florian Forster <octo.trailing-username(a)leading-domain.leeloo.lan.home.verplant.org>
Date:   Fri Mar 30 22:09:38 2007 +0200

    Bumped version to 3.11.3; Updated ChangeLog.

commit 27adc32054d5c395525bf781644693a41701433f
Author: Florian Forster <octo.trailing-username(a)leading-domain.leeloo.lan.home.verplant.org>
Date:   Wed Mar 28 17:43:57 2007 +0200

    configure.in: Define `HAVE_LIBKSTAT' when the `kstat'-library exists.

commit 05f37b50e75f25b66bafca0ff6af1c496b6eb01d
Author: Florian Forster <octo.trailing-username(a)leading-domain.entwicklung2.office.noris.de>
Date:   Fri Mar 16 11:45:15 2007 +0100

    iptables plugin: Remove `iptables_init' because it's not needed..
    
    ..and it causes the build to fail when `libiptc' wasn't present.