[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 34773d9 155f43f)
Merge remote-tracking branch 'github/pr/1396'
authorFlorian Forster <octo@collectd.org>
Sat, 6 Aug 2016 18:51:01 +0000 (20:51 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 6 Aug 2016 18:51:01 +0000 (20:51 +0200)

Trivial merge
statistics collection and monitoring daemon (clone)