tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 867cd3c) | patch

author	octo <octo>
	Sat, 10 Jun 2006 12:32:35 +0000 (12:32 +0000)
committer	octo <octo>
	Sat, 10 Jun 2006 12:32:35 +0000 (12:32 +0000)
commit	569a23ffadffa658bd7af8c58be6f36e4e8a6854
tree	92d82f710c7d528229dea24d95f310789840a6fe	tree \| snapshot
parent	867cd3c352d163bdcd19d1eb0d251aef13b30618	commit \| diff

octo@casella:~/collectd $ svn merge -r753:807 trunk branches/processes

14 files changed:

ChangeLog		diff \| blob \| history
Makefile.am		diff \| blob \| history
collectd.spec		diff \| blob \| history
configure.in		diff \| blob \| history
contrib/collection.cgi		diff \| blob \| history
debian/changelog		diff \| blob \| history
src/Makefile.am		diff \| blob \| history
src/apcups.c		diff \| blob \| history
src/common.c		diff \| blob \| history
src/common.h		diff \| blob \| history
src/hddtemp.c		diff \| blob \| history
src/liboping/liboping.c		diff \| blob \| history
src/memory.c		diff \| blob \| history
src/ntpd.c	[new file with mode: 0644]	blob

statistics collection and monitoring daemon (clone)