projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b49024 bcce4d5)
Merge branch 'master' into feature-riemann-threshold
authorPierre-Yves Ritschard <pyr@spootnik.org>
Tue, 22 Jul 2014 11:55:49 +0000 (13:55 +0200)
committerPierre-Yves Ritschard <pyr@spootnik.org>
Tue, 22 Jul 2014 11:55:49 +0000 (13:55 +0200)
1  2 
src/write_riemann.c patch | diff1 | diff2 | blob | history

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