tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c811c48 b1d3856)

author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Wed, 18 Mar 2009 17:41:27 +0000 (18:41 +0100)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Wed, 18 Mar 2009 17:41:27 +0000 (18:41 +0100)
commit	e4b8a186516b61f16d94a76db0aa102a3270d46c
tree	20ebfc40e92cfaddbde4c7368b82ae2ce79cb84d	tree \| snapshot
parent	c811c48c7cdd847af34d86a459af34c110155576	commit \| diff
parent	b1d3856d265c13c3684feda9e06fd0c7738ac4d1	commit \| diff

Merge branch 'collectd-4.6'

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

statistics collection and monitoring daemon (clone)