projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 87c071e dc3fcdf)
Auto-Merge pull request #2568 from octo/cid/157645
authorcollectd bot <32910397+collectd-bot@users.noreply.github.com>
Wed, 22 Nov 2017 07:14:52 +0000 (08:14 +0100)
committerGitHub <noreply@github.com>
Wed, 22 Nov 2017 07:14:52 +0000 (08:14 +0100)
Automatically merged due to "Automerge" label


Trivial merge
collectd, the system statistics collection daemon