Merge branch 'ff/nagios'
authorFlorian Forster <octo@collectd.org>
Tue, 1 Dec 2015 15:07:44 +0000 (16:07 +0100)
committerFlorian Forster <octo@collectd.org>
Tue, 1 Dec 2015 15:07:44 +0000 (16:07 +0100)
commit1729122da5c83da932bbd72cb8c3d4e55b0623d8
treeb12f210d21b9ef5a2a6de4f0c381ef8279513e17
parent3ba3bdfa3d71a63ee1d275c949d9da527abd31a6
parent3e14c965e9c8036cb85fcc1898c9acc82f6f0b15
Merge branch 'ff/nagios'
configure.ac
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod