projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: a72ad42 93c4fac)
Merge upstream, address conflict in src/utils/cmds/cmds_test.c
authorZebity Spring <zebity@yahoo.com>
Fri, 12 Jul 2019 07:45:33 +0000 (17:45 +1000)
committerZebity Spring <zebity@yahoo.com>
Fri, 12 Jul 2019 07:45:33 +0000 (17:45 +1000)

Trivial merge
collectd, the system statistics collection daemon