Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Sat, 5 Dec 2015 07:56:17 +0000 (08:56 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 5 Dec 2015 07:56:17 +0000 (08:56 +0100)
commit9b7dee8838f56233cea2854a7ddbcad2790609ce
treea40a940f60997676a4ce97ddd6360283ceeff836
parentd3c85c866ae36ca8fefb044eeb121d42e14ede38
parentdf6d9bfc1b24ecf4ebd1c86a57fc39f3b25abbb2
Merge branch 'collectd-5.4' into collectd-5.5
src/daemon/configfile.c
src/df.c
src/perl.c
src/pinba.c
src/postgresql.c
src/table.c
src/teamspeak2.c
src/threshold.c
src/utils_fbhash.c
src/vmem.c