projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d3ca6fe 65c20e4)
Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 10 Jun 2016 07:48:23 +0000 (09:48 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 10 Jun 2016 07:48:23 +0000 (09:48 +0200)
1  2 
src/ethstat.c patch | diff1 | diff2 | blob | history

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