projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 75d0fe5 f1b0dfc)
Merge remote-tracking branch 'github/pr/2472'
authorFlorian Forster <octo@collectd.org>
Thu, 18 Oct 2018 08:49:37 +0000 (10:49 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 18 Oct 2018 08:49:37 +0000 (10:49 +0200)
1  2 
Makefile.am patch | diff1 | diff2 | blob | history
src/collectd.conf.pod patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
collectd, the system statistics collection daemon