Merge branch 'collectd-5.7' into collectd-5.8
authorFlorian Forster <octo@collectd.org>
Thu, 18 Oct 2018 06:18:25 +0000 (08:18 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 18 Oct 2018 06:18:25 +0000 (08:18 +0200)
commit0a2172433970559cc70821e64778ce88a76b040c
treeed274ae041022f9d13468bc0d0306a2bb9a6b6bc
parent48362624e4c47bf3040b5c32cafaf5199d6ad4ac
parent9f7bed1cfdc00ff9e9160dd2ce01c6156362d450
Merge branch 'collectd-5.7' into collectd-5.8
src/disk.c
src/powerdns.c