Code

Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Thu, 18 Jun 2015 11:05:14 +0000 (13:05 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 18 Jun 2015 11:05:14 +0000 (13:05 +0200)
commit09c6a320f3cb36b5dbb2c2ce43858f33be7acf9b
tree248df40bc42615a06eadd5900e91ea24cebe14e6
parentfe3ed442ad6f9dfc583c91ab97f912f9ca44aee3
parentd09ec85d1584a7a0649a240b78f1390ff1296814
Merge branch 'collectd-5.4' into collectd-5.5
17 files changed:
src/amqp.c
src/curl_json.c
src/daemon/filter_chain.c
src/daemon/utils_avltree.c
src/email.c
src/exec.c
src/gmond.c
src/libcollectdclient/client.c
src/modbus.c
src/network.c
src/ntpd.c
src/openvpn.c
src/ping.c
src/powerdns.c
src/snmp.c
src/tail.c
src/threshold.c