Merge branch 'collectd-5.5'
authorFlorian Forster <octo@collectd.org>
Sat, 5 Dec 2015 07:57:07 +0000 (08:57 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 5 Dec 2015 07:57:07 +0000 (08:57 +0100)
commit8dfaf98cde62e42d4c245400c68ae9c825a2fe68
tree7bb078829a5d642c8e8c30195a9b2b55657cf3b1
parent225e6f9d962bcf50451d0cdcb56950fc97c90007
parent9b7dee8838f56233cea2854a7ddbcad2790609ce
Merge branch 'collectd-5.5'
19 files changed:
src/ceph.c
src/ceph_test.c
src/cpu.c
src/daemon/collectd.c
src/daemon/configfile.c
src/memcached.c
src/ntpd.c
src/perl.c
src/pinba.c
src/postgresql.c
src/processes.c
src/rrdtool.c
src/snmp.c
src/table.c
src/teamspeak2.c
src/threshold.c
src/varnish.c
src/write_graphite.c
src/zfs_arc.c