]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
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)
1  2 
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

diff --cc configure.ac
Simple merge
diff --cc src/bind.c
Simple merge
diff --cc src/curl_xml.c
Simple merge
Simple merge
Simple merge
diff --cc src/statsd.c
Simple merge
diff --cc src/unixsock.c
Simple merge
diff --cc src/varnish.c
Simple merge