projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb546b7 51d2997)
Merge branch 'collectd-5.7'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 5 Mar 2017 17:36:02 +0000 (18:36 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 5 Mar 2017 17:36:02 +0000 (18:36 +0100)
Conflicts:
contrib/redhat/collectd.spec


Trivial merge
collectd, the system statistics collection daemon