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

Merged trunk... huh...

26 files changed:

AUTHORS		diff \| blob \| history
ChangeLog	[new file with mode: 0644]	blob
INSTALL		diff \| blob \| history
Makefile.am		diff \| blob \| history
README		diff \| blob \| history
collectd.spec	[new file with mode: 0644]	blob
configure.in		diff \| blob \| history
contrib/museum/collection.cgi	[new file with mode: 0755]	blob
contrib/users	[new file with mode: 0644]	blob
debian/changelog	[new file with mode: 0644]	blob
debian/collectd-users.files	[new file with mode: 0644]	blob
debian/collectd.examples	[new file with mode: 0644]	blob
debian/control		diff \| blob \| history
debian/rules		diff \| blob \| history
src/Makefile.am		diff \| blob \| history
src/collectd.c		diff \| blob \| history
src/collectd.pod		diff \| blob \| history
src/common.h		diff \| blob \| history
src/config.h.in	[deleted file]	blob \| history
src/cpu.c	[new file with mode: 0644]	blob
src/cpu.h	[new file with mode: 0644]	blob
src/load.c	[new file with mode: 0644]	blob
src/load.h	[new file with mode: 0644]	blob
src/plugin.c		diff \| blob \| history
src/users.c	[new file with mode: 0644]	blob
src/users.h	[new file with mode: 0644]	blob

collectd, the system statistics collection daemon