projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4836262 9f7bed1)
Merge branch 'collectd-5.7' into collectd-5.8
authorFlorian Forster <octo@collectd.org>
Thu, 18 Oct 2018 06:18:25 +0000 (08:18 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 18 Oct 2018 06:18:25 +0000 (08:18 +0200)
1  2 
src/disk.c patch | diff1 | diff2 | blob | history
src/powerdns.c patch | diff1 | diff2 | blob | history

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