Merge pull request #1830 from rubenk/move-collectd-header
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 3 Aug 2016 11:41:40 +0000 (13:41 +0200)
committerGitHub <noreply@github.com>
Wed, 3 Aug 2016 11:41:40 +0000 (13:41 +0200)
treewide: add blank line below collectd.h

20 files changed:
1  2 
src/apcups.c
src/chrony.c
src/daemon/collectd.c
src/daemon/common.c
src/gmond.c
src/hddtemp.c
src/mbmon.c
src/memcached.c
src/modbus.c
src/network.c
src/ntpd.c
src/olsrd.c
src/pinba.c
src/statsd.c
src/teamspeak2.c
src/write_graphite.c
src/write_sensu.c
src/write_tsdb.c
src/xencpu.c
src/zookeeper.c

diff --cc src/apcups.c
Simple merge
diff --cc src/chrony.c
Simple merge
Simple merge
Simple merge
diff --cc src/gmond.c
Simple merge
diff --cc src/hddtemp.c
Simple merge
diff --cc src/mbmon.c
Simple merge
diff --cc src/memcached.c
Simple merge
diff --cc src/modbus.c
Simple merge
diff --cc src/network.c
Simple merge
diff --cc src/ntpd.c
Simple merge
diff --cc src/olsrd.c
Simple merge
diff --cc src/pinba.c
Simple merge
diff --cc src/statsd.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/xencpu.c
Simple merge
diff --cc src/zookeeper.c
Simple merge