tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ead5567 258c926)

author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Fri, 31 Aug 2007 14:08:37 +0000 (16:08 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Fri, 31 Aug 2007 14:08:37 +0000 (16:08 +0200)
commit	2b6176cab4f092354177473bbc74c5cdc2eaa2ec
tree	a7fd4cdf88ccd569d972ddf58afd059851061e8b	tree \| snapshot
parent	ead5567107bc6a39a0e96b2756bc0711d67a538b	commit \| diff
parent	258c92657e3e1eadf2388d697554270eb6fc3f9f	commit \| diff

Merge branch 'collectd-3.11' into collectd-4.0

Conflicts:

ChangeLog
configure.in

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

statistics collection and monitoring daemon (clone)