Merge branch 'collectd-5.6'
authorFlorian Forster <octo@collectd.org>
Wed, 2 Nov 2016 08:36:48 +0000 (09:36 +0100)
committerFlorian Forster <octo@collectd.org>
Wed, 2 Nov 2016 08:36:48 +0000 (09:36 +0100)
commitc442c66d9e98852f1b8eaa1b816d6ee7f84d0342
tree00d829a70002a5da549fdf82563968c0cf472341
parent7aa46a8e912feef20c2bb1e614f2d4e4e1639493
parent4979d8dcd6f097eb8fd4661086e28accd31ff905
Merge branch 'collectd-5.6'
configure.ac
src/battery.c
src/daemon/common.c
src/openvpn.c
src/powerdns.c
src/utils_format_graphite.c
src/write_kafka.c
src/zfs_arc.c