git.octo.it Git - collectd.git/commit

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ae4ec8f bcd127b)

author	octo <octo>
	Fri, 14 Apr 2006 10:53:44 +0000 (10:53 +0000)
committer	octo <octo>
	Fri, 14 Apr 2006 10:53:44 +0000 (10:53 +0000)
commit	4ff510ffa41e47f31c695c83f045fd79efecf5f4
tree	aba728769cd3f226db1488878e420cb5df4d4eff	tree \| snapshot
parent	ae4ec8f9725c51ea296454344db0f9c7361a065d	commit \| diff
parent	bcd127b99eb16566fd2bdb687d3f7172e3cdbc27	commit \| diff

Merged `branches/log-mode' to `trunk'

AUTHORS	diff1 \|	diff2 \|	blob \| history
src/collectd.c	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	diff1 \|	diff2 \|	blob \| history
src/collectd.h	diff1 \|	diff2 \|	blob \| history
src/collectd.pod	diff1 \|	diff2 \|	blob \| history
src/common.c	diff1 \|	diff2 \|	blob \| history
src/common.h	diff1 \|	diff2 \|	blob \| history
src/configfile.c	diff1 \|	diff2 \|	blob \| history
src/network.c	diff1 \|	diff2 \|	blob \| history
src/plugin.c	diff1 \|	diff2 \|	blob \| history

collectd, the system statistics collection daemon