tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 49f55f7 b2491d8)

author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Mon, 16 Feb 2009 11:35:23 +0000 (12:35 +0100)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Mon, 16 Feb 2009 11:35:23 +0000 (12:35 +0100)
commit	7c8fb05fcb919fb2d9fc68757c198916396600ce
tree	d2a7670c7d22fd4113b5973d4eb94819e6911eaa	tree \| snapshot
parent	49f55f7f02eeb1b9ef72703d7f5cbb7cde202415	commit \| diff
parent	b2491d8cc416955fb0df16b74a28f218a2dedc01	commit \| diff

Merge branch 'collectd-4.4' into collectd-4.5

Conflicts:

configure.in

configure.in	diff1 \|	diff2 \|	blob \| history
contrib/collection.cgi	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)