tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 652bf01 4ed1a60)

author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Thu, 14 Jan 2010 14:19:39 +0000 (15:19 +0100)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Thu, 14 Jan 2010 14:19:39 +0000 (15:19 +0100)
commit	7e504c50768c77d78003e1e27afe6f9f81a85b85
tree	3cec2f60759244f2affa7c33266ae6bfba5e1f24	tree \| snapshot
parent	652bf01441baf806cc0e5aed34e0e58746dc73ea	commit \| diff
parent	4ed1a6084d08463f09ccecd50be1fb245d49231e	commit \| diff

Merge branch 'collectd-4.8' into collectd-4.9

Conflicts:
ChangeLog

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

statistics collection and monitoring daemon (clone)