projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba61125 2df359d)
Auto-Merge pull request #2560 from octo/cid/179237
authorcollectd bot <32910397+collectd-bot@users.noreply.github.com>
Mon, 20 Nov 2017 11:15:53 +0000 (12:15 +0100)
committerGitHub <noreply@github.com>
Mon, 20 Nov 2017 11:15:53 +0000 (12:15 +0100)
Automatically merged due to "Automerge" label


Trivial merge
collectd, the system statistics collection daemon