Code

Merge branch 'collectd-5.6' into collectd-5.7
authorFlorian Forster <octo@collectd.org>
Tue, 16 May 2017 17:34:25 +0000 (19:34 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 16 May 2017 17:34:25 +0000 (19:34 +0200)
commitfbaf81a04c23d51947d94a5c7d9142290dff07bc
tree29f383b61a3f1c61e9432ade95dcd54e539c6431
parent43625304e5028751d03f9bbcc38ee1c12b0efb6f
parent8a2be9037587c1b80a00ddb1d7d396d1d48ec37d
Merge branch 'collectd-5.6' into collectd-5.7
src/collectd.conf.pod
src/curl_json.c
src/perl.c