Code

Merge branch 'collectd-5.6' into collectd-5.7
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 7 Jul 2017 16:40:55 +0000 (18:40 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 7 Jul 2017 16:40:55 +0000 (18:40 +0200)
commitf374b72032a227a75b6bc9ae574cd28abbc16f24
tree6209162e62603c20b4480edc8239c28f168616e9
parent02a29964b4e67bb04c1419daedc8eacfafdf0a7c
parenteeb544426d73da7993a24372dd4cd9fb8cca9627
Merge branch 'collectd-5.6' into collectd-5.7
src/apache.c
src/ascent.c
src/bind.c
src/curl.c
src/curl_json.c
src/curl_xml.c
src/nginx.c
src/write_http.c