projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9bd400b 24c2f24)
Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 7 Jul 2015 22:35:27 +0000 (00:35 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 7 Jul 2015 22:35:27 +0000 (00:35 +0200)
1  2 
src/collectd.conf.in patch | diff1 | diff2 | blob | history
src/daemon/Makefile.am patch | diff1 | diff2 | blob | history

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