projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6164fe4 36d1b24)
Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 1 Mar 2016 16:07:01 +0000 (17:07 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 1 Mar 2016 16:07:01 +0000 (17:07 +0100)
1  2 
src/write_sensu.c patch | diff1 | diff2 | blob | history

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