Code

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)
1  2 
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

diff --cc configure.ac
Simple merge
diff --cc src/battery.c
Simple merge
Simple merge
diff --cc src/openvpn.c
Simple merge
diff --cc src/powerdns.c
Simple merge
Simple merge
Simple merge
diff --cc src/zfs_arc.c
Simple merge