projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d25b7b 5d00fcd)
Fix merge conflicts
authorAndrew Bays <andrew.bays@gmail.com>
Wed, 4 Sep 2019 19:51:51 +0000 (15:51 -0400)
committerAndrew Bays <andrew.bays@gmail.com>
Wed, 4 Sep 2019 19:51:51 +0000 (15:51 -0400)

Trivial merge
collectd, the system statistics collection daemon