[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06d15fe 48dc178)
Merge remote-tracking branch 'origin/pr/1229'
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 11 Sep 2015 20:17:44 +0000 (22:17 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 11 Sep 2015 20:17:44 +0000 (22:17 +0200)
1  2 
src/collectd.conf.pod patch | diff1 | diff2 | blob | history

diff --cc src/collectd.conf.pod
Simple merge
statistics collection and monitoring daemon (clone)