Merge remote-tracking branch 'github/pr/2437'
authorFlorian Forster <octo@collectd.org>
Wed, 27 Sep 2017 10:31:37 +0000 (12:31 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 27 Sep 2017 10:31:37 +0000 (12:31 +0200)
commitd151e98a31a4563af8842b959755ef28a5902a72
treee1bc00590646e3fde3ccaf34d191b2b92f88b34a
parent2ec16cfeb86629a81a6942deb9b7e3c1b1711e02
parent31247addc8e371fbfcacce2ad58e98ae43556eb5
Merge remote-tracking branch 'github/pr/2437'
src/collectd.conf.in
src/collectd.conf.pod