[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3bd15a4 cd401b9)
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 patch | diff1 | diff2 | blob | history

diff --cc src/write_prometheus.c
Simple merge
statistics collection and monitoring daemon (clone)