tokkee.org

Code

projects / collectd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8991abf 716a701)

author	Florian Forster <octo@collectd.org>
	Sun, 1 Apr 2012 10:01:58 +0000 (12:01 +0200)
committer	Florian Forster <octo@collectd.org>
	Sun, 1 Apr 2012 10:01:58 +0000 (12:01 +0200)
commit	483e801902bca3c779793224eddf3bb2749d7288
tree	aef80e2d0dc6cdc6285f8a5a341e58ea5637eda6	tree \| snapshot
parent	8991abf98de418b8464aa0f3251b024c9292da96	commit \| diff
parent	716a701876f324fa220adaf65a12ed5984eba80d	commit \| diff

Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
ChangeLog
src/collectd.conf.pod
src/common.c
src/network.c
src/processes.c
version-gen.sh

12 files changed:

ChangeLog	diff1 \|	diff2 \|	blob \| history
configure.in	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	diff1 \|	diff2 \|	blob \| history
src/common.c	diff1 \|	diff2 \|	blob \| history
src/common.h	diff1 \|	diff2 \|	blob \| history
src/libcollectdclient/client.c	diff1 \|	diff2 \|	blob \| history
src/memcached.c	diff1 \|	diff2 \|	blob \| history
src/network.c	diff1 \|	diff2 \|	blob \| history
src/perl.c	diff1 \|	diff2 \|	blob \| history
src/processes.c	diff1 \|	diff2 \|	blob \| history
src/snmp.c	diff1 \|	diff2 \|	blob \| history

statistics collection and monitoring daemon (clone)