tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 453d1a7 7c8fb05)

author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Mon, 16 Feb 2009 11:48:22 +0000 (12:48 +0100)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Mon, 16 Feb 2009 11:48:22 +0000 (12:48 +0100)
commit	6597f3a6584704f92f824f3cf7bac3369102e8a0
tree	7a7cd9ca371861d757db7433b84b5d4e737cbce6	tree \| snapshot
parent	453d1a73480b2422ce83cdbdf1c8e5fc5037e3ce	commit \| diff
parent	7c8fb05fcb919fb2d9fc68757c198916396600ce	commit \| diff

Merge branch 'collectd-4.5'

Conflicts:

configure.in

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

statistics collection and monitoring daemon (clone)