projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e052e38 0742dc6)
Merge remote branch 'trenkel/st/netapp' into st/netapp
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 28 Sep 2009 12:43:37 +0000 (14:43 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 28 Sep 2009 12:43:37 +0000 (14:43 +0200)
1  2 
src/netapp.c patch | diff1 | diff2 | blob | history

diff --cc src/netapp.c
Simple merge
collectd, the system statistics collection daemon