author | Florian Forster <octo@collectd.org> | |
Sun, 19 Feb 2012 10:11:28 +0000 (11:11 +0100) | ||
committer | Florian Forster <octo@collectd.org> | |
Sun, 19 Feb 2012 10:11:28 +0000 (11:11 +0100) | ||
commit | 3904b4b9fd1a53c93f31d8fec709a7b7b8300513 | |
tree | 2811913611abb933adfe42aa6e37681b7601d3b5 | tree | snapshot |
parent | d0bb20feb1c5915e8b8af24cc2d46c4ac82d6704 | commit | diff |
parent | 8a81e4d5907c43d22a808dbfe088eb4ddab2a16b | commit | diff |
Merge branch 'collectd-4.10' into collectd-5.0
Conflicts:
ChangeLog
version-gen.sh
Change-Id: Id72b28eb1432835ab710d1f551bb886d0638e079
Conflicts:
ChangeLog
version-gen.sh
Change-Id: Id72b28eb1432835ab710d1f551bb886d0638e079
ChangeLog | diff1 | | diff2 | | blob | history |
configure.in | diff1 | | diff2 | | blob | history |
src/exec.c | diff1 | | diff2 | | blob | history |
src/network.c | diff1 | | diff2 | | blob | history |