Merge branch 'collectd-5.7'
authorFlorian Forster <octo@collectd.org>
Thu, 22 Dec 2016 09:57:57 +0000 (10:57 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 22 Dec 2016 09:57:57 +0000 (10:57 +0100)
commit786a6be461cf58ef2b8c57974cad2a79ba2ee82c
tree472d97db8017c1eb3917e6d633545cbbda292be5
parent7269bf71e30f0a70a9eb954f6b0a6fe1b10eb6e5
parentbdd27cb013de89b4149393212aef1bf45a221dba
Merge branch 'collectd-5.7'
src/daemon/common.c
src/daemon/configfile.c
src/netapp.c