tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: dc1acaa 496d4e6)

author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 11 Jul 2009 12:59:21 +0000 (14:59 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 11 Jul 2009 12:59:21 +0000 (14:59 +0200)
commit	6ea00a8e17fccbac0cc5dee711ee2e4cb73bdaaa
tree	309f768be00d681966c87e88ac723986c99619bc	tree \| snapshot
parent	dc1acaab169b0f1b2b43fed1b7044d19e6d92844	commit \| diff
parent	496d4e6272689604c4f4daab6823c99dd4e4fb50	commit \| diff

Merge branch 'ps/tokyotyrant'

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

statistics collection and monitoring daemon (clone)