Code

Merge branch 'collectd-4.7' into collectd-4.8
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Sep 2009 12:32:34 +0000 (14:32 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Sep 2009 12:32:34 +0000 (14:32 +0200)
commit79c87aeda9172e219a842e393c6499c8bf37662a
tree8bc2e5594a2cc6750b1337fbd35c564982c05a02
parente6a052ab22a285b1c6e91fb8678168fd1ffdca92
parenta9d3d970d5add3798d46c81b35ffe4ed17dea320
Merge branch 'collectd-4.7' into collectd-4.8

Conflicts:
ChangeLog
contrib/collection3/etc/collection.conf
src/df.c
version-gen.sh
12 files changed:
ChangeLog
README
configure.in
contrib/collection3/etc/collection.conf
contrib/cussh.pl
src/Makefile.am
src/collectd.conf.in
src/curl.c
src/df.c
src/network.c
src/plugin.c
src/powerdns.c