tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e7be1d7 c15dbfc)

author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Tue, 17 Aug 2010 16:53:38 +0000 (18:53 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Tue, 17 Aug 2010 16:53:38 +0000 (18:53 +0200)
commit	b53110ef99e3d6a5e2f8e79b8f068cfe96a1accb
tree	4f160197b9191453db6ac038823615806e54841e	tree \| snapshot
parent	e7be1d7ea062e8d4d59c04c42e63d655188dc597	commit \| diff
parent	c15dbfc3739f7c3bbd8171797eaef55749008bfa	commit \| diff

Merge branch 'collectd-4.10'

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

statistics collection and monitoring daemon (clone)