Merge branch 'collectd-5.7'
authorFlorian Forster <octo@collectd.org>
Fri, 6 Oct 2017 07:50:40 +0000 (09:50 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 6 Oct 2017 07:50:40 +0000 (09:50 +0200)
1  2 
src/write_prometheus.c

Simple merge