Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Sat, 5 Dec 2015 21:06:35 +0000 (22:06 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 5 Dec 2015 21:06:35 +0000 (22:06 +0100)
commit791e99923dbbf045b11fbd7b0ea8df647e29593e
treecacb9d28f76f33efd66bdad7cd3346d094f19194
parent154cdd973167f1c9b5aab33875fe47af6a0964a6
parent4d04d3b7e32b8777f7c7b04110b74194b991fbea
Merge branch 'collectd-5.4' into collectd-5.5
configure.ac
src/bind.c
src/curl_xml.c
src/daemon/utils_cache.c
src/libcollectdclient/client.c
src/statsd.c
src/unixsock.c
src/varnish.c