projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b3b958 e495b4a)
Auto-Merge pull request #2938 from octo/ff/format_json
authorcollectd bot <32910397+collectd-bot@users.noreply.github.com>
Fri, 5 Oct 2018 20:15:01 +0000 (22:15 +0200)
committerGitHub <noreply@github.com>
Fri, 5 Oct 2018 20:15:01 +0000 (22:15 +0200)
Automatically merged due to "Automerge" label


Trivial merge
collectd, the system statistics collection daemon