tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 658c857 50aeefd)

author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sun, 13 Sep 2009 10:24:20 +0000 (12:24 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sun, 13 Sep 2009 10:24:20 +0000 (12:24 +0200)
commit	3ddd3791fefa478d770aba82303ec6a1913874fc
tree	670c807cb613a9e9e87f62dff1cfeb9089113fa3	tree \| snapshot
parent	658c85755ef1f4284228d1e5edbc4452a31bd944	commit \| diff
parent	50aeefda1c2fab3be57d26e1ca221c1e3774e5c3	commit \| diff

Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
ChangeLog
version-gen.sh

ChangeLog	diff1 \|	diff2 \|	blob \| history
contrib/collection3/etc/collection.conf	diff1 \|	diff2 \|	blob \| history
src/powerdns.c	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)