tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cd9f575 bc2d940)

author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Fri, 30 Mar 2007 20:04:16 +0000 (22:04 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Fri, 30 Mar 2007 20:04:16 +0000 (22:04 +0200)
commit	0352eb93e70fb471d4975823db38147d2661f4bf
tree	9c2b45fa44976181853b44881d55d954e7bf3e97	tree \| snapshot
parent	cd9f575473775152f0a8ff31be5679b9a56a697f	commit \| diff
parent	bc2d94024d0250211c1e498db1b43bb4525324da	commit \| diff

Merge branch 'pull/collectd-4' into collectd-4

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

statistics collection and monitoring daemon (clone)