Code

Merge branch 'collectd-4.7'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 17 Aug 2009 08:46:05 +0000 (10:46 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 17 Aug 2009 08:46:05 +0000 (10:46 +0200)
commit1e4db580e37d235755de0c4a4c08ba7a6ac7bb4c
treee305d2f29bb5934065374125545960164a29aa3e
parentdc0a112ba2a77dc61ab99dcbbda2e0bbf133d6ed
parentde38c1a6e44cadfc88fc6e1d0919663f0c08bbdc
Merge branch 'collectd-4.7'

Conflicts:
src/network.c
src/collectd.conf.in
src/collectd.conf.pod
src/java.c
src/meta_data.c
src/plugin.c
src/utils_cache.c