Merge remote-tracking branch 'github/pr/2434'
authorFlorian Forster <octo@collectd.org>
Thu, 21 Sep 2017 20:00:14 +0000 (22:00 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 21 Sep 2017 20:00:14 +0000 (22:00 +0200)
commit23d34e73bdbdf0ef5b9221ad821c9560d4d8e0bb
treeefa3dbb31c8b1bb1ae27de77995d6c86a68eafd1
parent4d651bf30af5408da82e753b6232fc64dcba96db
parent2330d3babccf9d32fec4c5a56075692ce47228ab
Merge remote-tracking branch 'github/pr/2434'
src/collectd.conf.in
src/collectd.conf.pod