projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 708efd7 9fa24ed)
Merge branch 'pr/1345'
authorFlorian Forster <octo@collectd.org>
Fri, 27 Nov 2015 09:06:20 +0000 (10:06 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 27 Nov 2015 09:06:20 +0000 (10:06 +0100)
1  2 
src/mqtt.c patch | diff1 | diff2 | blob | history

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