Merge remote-tracking branch 'github/pr/2091'
authorFlorian Forster <octo@collectd.org>
Fri, 6 Oct 2017 11:14:01 +0000 (13:14 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 6 Oct 2017 11:14:01 +0000 (13:14 +0200)
commit1581f3b307554cbf8b5784729754c5d73a1192a5
tree01c9182f7adc69f4514cf06e3644a7b34b39f4d1
parent5dbb7471b0a7ca7506f56f4c6dbaf58e790c6b7c
parentd34eaa5533e6e78870d3ac52857152ea35cbd01e
Merge remote-tracking branch 'github/pr/2091'
src/collectd.conf.in
src/collectd.conf.pod
src/ipmi.c