Merge branch 'collectd-5.7'
authorFlorian Forster <octo@collectd.org>
Fri, 12 May 2017 13:19:43 +0000 (15:19 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 12 May 2017 13:19:43 +0000 (15:19 +0200)
1  2 
src/write_prometheus.c

Simple merge