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

[Florian Forster]

 configure.in   |   20 +++++++++++++++++++-
 src/iptables.c |   45 +++++++++++++++++++++++++++++++++++++++------
 2 files changed, 58 insertions(+), 7 deletions(-)

New commits:
commit 658c85755ef1f4284228d1e5edbc4452a31bd944
Merge: 9d15d1058b93acb7be041934acfe76548539041a b3315d59fb67edf77cfd90519c750ae1ce7e4146
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Sep 6 12:52:15 2009 +0000

    Merged branch 'sh/collectd-4.6' into sh/collectd-4.7.
    
    Conflicts:
    	src/iptables.c
    
    To resolve the conflict, the changes to the iptables plugin have been updated
    to support ip6tc as well.

commit b3315d59fb67edf77cfd90519c750ae1ce7e4146
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Sep 6 12:14:55 2009 +0000

    iptables plugin: Support the new libiptc API.
    
    When libiptc has been officially made available as a shared library, the API
    and ABI have been changed slightly. By checking for the existance of a type
    that has been removed in that course, configure now checks which version is
    available. This is quite error prone (the type might be re-introduced any
    time), so this should be improved some time - currently, I do not have an idea
    how to do so, though :-/

commit cba0f3fc0e50b9aa9c24e355926b290efa35e8a6
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Sep 6 10:36:10 2009 +0000

    configure: Replaced src/libiptc/ with src/owniptc/.