[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f5d58f 4f9adee)
Merge branch 'collectd-5.5' into collectd-5.6
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 29 Nov 2016 11:31:39 +0000 (12:31 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 29 Nov 2016 11:31:39 +0000 (12:31 +0100)
Conflicts:
contrib/redhat/collectd.spec


Trivial merge
statistics collection and monitoring daemon (clone)