projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 084761b 3d082a9)
Merge branch 'collectd-5.8'
authorFlorian Forster <octo@collectd.org>
Fri, 1 Dec 2017 10:26:17 +0000 (11:26 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 1 Dec 2017 10:26:17 +0000 (11:26 +0100)
1  2 
src/ping.c patch | diff1 | diff2 | blob | history

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