projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f8cbc2 2999bfd)
Merge remote-tracking branch 'github-tokkee/sh/netapp'
authorFlorian Forster <octo@collectd.org>
Tue, 29 Jan 2013 09:40:24 +0000 (10:40 +0100)
committerFlorian Forster <octo@collectd.org>
Tue, 29 Jan 2013 09:40:24 +0000 (10:40 +0100)
1  2 
src/collectd.conf.pod patch | diff1 | diff2 | blob | history

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