[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b88aba2 ebb15e3)
Merge remote-tracking branch 'github/pr/2081' into collectd-5.7
authorFlorian Forster <octo@collectd.org>
Tue, 6 Dec 2016 12:40:09 +0000 (13:40 +0100)
committerFlorian Forster <octo@collectd.org>
Tue, 6 Dec 2016 12:40:09 +0000 (13:40 +0100)

Trivial merge
statistics collection and monitoring daemon (clone)