author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Sun, 6 Sep 2009 10:15:06 +0000 (12:15 +0200) | ||
committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Sun, 6 Sep 2009 10:15:06 +0000 (12:15 +0200) | ||
commit | 9d15d1058b93acb7be041934acfe76548539041a | |
tree | fec91ba8303ee2786dd1b472e031b7cd8fa36a2a | tree | snapshot |
parent | cce535f9fbb96dce74e94c5077bae08b1be8b2c4 | commit | diff |
parent | 2438b95b7f7930902d021aa749308ea8ae5652ca | commit | diff |
Merge branch 'collectd-4.6' into collectd-4.7
Conflicts:
configure.in
src/iptables.c
Conflicts:
configure.in
src/iptables.c
configure.in | diff1 | | diff2 | | blob | history |
contrib/collection.cgi | diff1 | | diff2 | | blob | history |
contrib/collection3/etc/collection.conf | diff1 | | diff2 | | blob | history |
src/Makefile.am | diff1 | | diff2 | | blob | history |
src/iptables.c | diff1 | | diff2 | | blob | history |
src/powerdns.c | diff1 | | diff2 | | blob | history |