projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eae2d2a 2cf1055)
Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 6 Mar 2016 11:09:29 +0000 (12:09 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 6 Mar 2016 11:09:29 +0000 (12:09 +0100)
1  2 
src/utils_mount.c patch | diff1 | diff2 | blob | history
src/zfs_arc.c patch | diff1 | diff2 | blob | history

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