tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0f5d1ee 688d103)

author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Mon, 7 Feb 2011 07:46:04 +0000 (08:46 +0100)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Mon, 7 Feb 2011 07:46:04 +0000 (08:46 +0100)
commit	801389e2a2f0f232f7014702e276c5f992cca723
tree	c53008d6bff6d04670999cfd53b566b9d75910aa	tree \| snapshot
parent	0f5d1ee8c3fc787df12d72dfe1bbedaa9e80ed5f	commit \| diff
parent	688d10341f7de5fc09fa48eeb367886027e11e7e	commit \| diff

Merge remote branch 'origin/ff/modbus'

src/collectd.conf.pod	diff1 \|	diff2 \|	blob \| history
src/modbus.c	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)