Code

Merge branch 'collectd-4.3'
authorFlorian Forster <octo@huhu.verplant.org>
Sat, 22 Mar 2008 08:41:42 +0000 (09:41 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Sat, 22 Mar 2008 08:41:42 +0000 (09:41 +0100)
commita813e8af8379bd0f55a2b46fc7918fa31de9522e
treef0ddb4414bb623699c6f03c56b3c8eb77deba737
parent8546a21667f4c1aee88324dac0b21a0f1931a3f5
parent4f2642f86673329db9f8cf30854bf39bbdc4c2b2
Merge branch 'collectd-4.3'

Conflicts:

src/utils_cache.c
configure.in
src/collectd.conf.pod
src/network.c
src/plugin.c
src/unixsock.c
src/utils_cache.c
src/utils_cache.h