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)
commit57b9e83320b35d4dbd1312db5fbf33ddf8ecd989
tree7233ce0caab845cc95653f4718841e1553733b80
parente791fa91e1cf63546d32a60a7496e153ee78de90
parent43625304e5028751d03f9bbcc38ee1c12b0efb6f
Merge branch 'collectd-5.7'
src/write_prometheus.c