projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f8232cf df51d49)
Merge remote-tracking branch 'github/pr/1958' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Sat, 8 Oct 2016 05:48:15 +0000 (07:48 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 8 Oct 2016 05:48:15 +0000 (07:48 +0200)
1  2 
src/daemon/common.c patch | diff1 | diff2 | blob | history

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