Merge branch 'collectd-5.5'
authorFlorian Forster <octo@collectd.org>
Sat, 5 Dec 2015 21:06:46 +0000 (22:06 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 5 Dec 2015 21:06:46 +0000 (22:06 +0100)
commit40aabf444e124f40603021821e98bcc40c4aaa0e
tree6b741d26e2de42671b3a2c634874129e5eb50c76
parent8dfaf98cde62e42d4c245400c68ae9c825a2fe68
parent791e99923dbbf045b11fbd7b0ea8df647e29593e
Merge branch 'collectd-5.5'
14 files changed:
configure.ac
src/bind.c
src/curl_xml.c
src/daemon/utils_cache.c
src/libcollectdclient/client.c
src/madwifi.c
src/statsd.c
src/unixsock.c
src/varnish.c
src/write_riemann.c
src/write_sensu.c
src/write_tsdb.c
src/zfs_arc.c
src/zookeeper.c