projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 557b86c 7da2cd6)
Merge remote-tracking branch 'github/pr/2190'
authorFlorian Forster <octo@collectd.org>
Thu, 18 May 2017 08:07:03 +0000 (10:07 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 18 May 2017 08:07:03 +0000 (10:07 +0200)
1  2 
src/types.db patch | diff1 | diff2 | blob | history

diff --cc src/types.db
Simple merge
collectd, the system statistics collection daemon