[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 820020d 4c92b22)
Merge remote-tracking branch 'github/pr/2027' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Sun, 6 Nov 2016 19:40:36 +0000 (20:40 +0100)
committerFlorian Forster <octo@collectd.org>
Sun, 6 Nov 2016 19:40:36 +0000 (20:40 +0100)

Trivial merge
statistics collection and monitoring daemon (clone)