Code

Merge branch 'collectd-4.10' into collectd-5.0
authorFlorian Forster <octo@collectd.org>
Sun, 1 Apr 2012 10:01:58 +0000 (12:01 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 1 Apr 2012 10:01:58 +0000 (12:01 +0200)
commit483e801902bca3c779793224eddf3bb2749d7288
treeaef80e2d0dc6cdc6285f8a5a341e58ea5637eda6
parent8991abf98de418b8464aa0f3251b024c9292da96
parent716a701876f324fa220adaf65a12ed5984eba80d
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
configure.in
src/Makefile.am
src/collectd.conf.pod
src/common.c
src/common.h
src/libcollectdclient/client.c
src/memcached.c
src/network.c
src/perl.c
src/processes.c
src/snmp.c