[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 58acba6 b7e942f)
Merge remote-tracking branch 'github/pr/2012' into collectd-5.6
authorFlorian Forster <octo@collectd.org>
Sat, 29 Oct 2016 20:08:32 +0000 (22:08 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 29 Oct 2016 20:08:32 +0000 (22:08 +0200)

Trivial merge
statistics collection and monitoring daemon (clone)