projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7c89cc 2c2a8af)
Merge branch 'contrib-docker-cleanup'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 5 Dec 2016 19:53:48 +0000 (20:53 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 5 Dec 2016 19:53:48 +0000 (20:53 +0100)

Trivial merge
collectd, the system statistics collection daemon