Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Thu, 18 Jun 2015 14:52:09 +0000 (16:52 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 18 Jun 2015 14:52:09 +0000 (16:52 +0200)
commit0003c4d3c184f0f437499d6073cd023dc7b659c2
tree0f942489579db24cf4b560df21830491dca1f9ba
parent2493484aac8d45b5a5abdb80f4db8c51db77bf6e
parent9c3ed6462c15fd1cb664cd0ec2a5efb289aa1af6
Merge branch 'collectd-5.4' into collectd-5.5
src/Makefile.am
src/daemon/collectd.c
src/daemon/configfile.c
src/df.c
src/snmp.c
src/table.c
src/threshold.c
src/utils_db_query.c
src/virt.c