projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da41d78 191323d)
Merge branch 'pr/1393'
authorFlorian Forster <octo@collectd.org>
Thu, 17 Dec 2015 09:02:09 +0000 (10:02 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 17 Dec 2015 09:02:09 +0000 (10:02 +0100)
1  2 
src/write_kafka.c patch | diff1 | diff2 | blob | history

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