projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2ff4dd 5f23aa2)
Merge remote-tracking branch 'github/pr/1879'
authorFlorian Forster <octo@collectd.org>
Mon, 15 Aug 2016 17:57:30 +0000 (19:57 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 15 Aug 2016 17:57:30 +0000 (19:57 +0200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/write_riemann.c patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc src/write_riemann.c
Simple merge
collectd, the system statistics collection daemon