git.tokkee.org Git - collectd.git/commit

author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Tue, 28 Aug 2007 22:02:21 +0000 (00:02 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Tue, 28 Aug 2007 22:02:21 +0000 (00:02 +0200)
commit	12c1e32ec71ffd5d90af5df4b430fba04d91aed5
tree	56f5bf859eec4fc23813a5d200f1cc8500692b4e	tree \| snapshot
parent	3b19fa6b46228ad7966e10a89856fb46da0f7739	commit \| diff
parent	ead5567107bc6a39a0e96b2756bc0711d67a538b	commit \| diff

Merge branch 'collectd-4.0'

Conflicts:

ChangeLog
configure.in
src/Makefile.am
src/collectd-unixsock.pod
src/mysql.c
src/nut.c

statistics collection and monitoring daemon (clone)

tokkee.org