Merge remote-tracking branch 'github/pr/2488'
authorFlorian Forster <octo@collectd.org>
Wed, 18 Oct 2017 18:27:04 +0000 (20:27 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 18 Oct 2017 18:27:04 +0000 (20:27 +0200)
1  2 
src/collectd.conf.in
src/snmp.c

Simple merge
diff --cc src/snmp.c
Simple merge