Code

Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Fri, 19 Jun 2015 13:11:39 +0000 (15:11 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 19 Jun 2015 13:11:39 +0000 (15:11 +0200)
commit81a5fd5046c6a39f580a8fc1a3af837fd5f5aa5c
tree903ec431077656b1f7977d5cf4e1d4207969aaab
parent0003c4d3c184f0f437499d6073cd023dc7b659c2
parenta7850b871becb5121794a7fc6c1f7242588ee33f
Merge branch 'collectd-5.4' into collectd-5.5
17 files changed:
src/apache.c
src/collectdmon.c
src/curl.c
src/curl_json.c
src/curl_xml.c
src/daemon/utils_cache.c
src/gmond.c
src/java.c
src/memcachec.c
src/powerdns.c
src/snmp.c
src/threshold.c
src/utils_cmd_flush.c
src/utils_cmd_putval.c
src/utils_ignorelist.c
src/utils_latency.c
src/utils_rrdcreate.c