Code

Merge remote-tracking branch 'github/pr/2258'
authorFlorian Forster <octo@collectd.org>
Wed, 30 Aug 2017 11:34:28 +0000 (13:34 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 30 Aug 2017 11:34:28 +0000 (13:34 +0200)
1  2 
Makefile.am
configure.ac
src/collectd-nagios.c
src/collectd-tg.c
src/collectdctl.c
src/libcollectdclient/client.c

diff --cc Makefile.am
Simple merge
diff --cc configure.ac
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge