]> 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: 6eb5239 573db6c)
Merge branch 'collectd-5.4' into collectd-5.5 collectd-5.5.1
authorFlorian Forster <octo@collectd.org>
Fri, 22 Jan 2016 09:53:29 +0000 (10:53 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 22 Jan 2016 09:53:29 +0000 (10:53 +0100)
1  2 
src/collectd.conf.pod patch | diff1 | diff2 | blob | history
src/df.c patch | diff1 | diff2 | blob | history

diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/df.c
Simple merge
statistics collection and monitoring daemon (clone)