]> git.tokkee.org Git - collectd.git/commitdiff
[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 57bd4c5 c94e448)
Merge remote-tracking branch 'github/pr/413' into collectd-5.4
authorFlorian Forster <octo@collectd.org>
Wed, 28 Aug 2013 13:22:37 +0000 (15:22 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 28 Aug 2013 13:22:37 +0000 (15:22 +0200)
1  2 
src/cgroups.c patch | diff1 | diff2 | blob | history

diff --cc src/cgroups.c
Simple merge
statistics collection and monitoring daemon (clone)