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)
Conflicts:
src/network.c

1  2 
src/collectd.conf.in
src/collectd.conf.pod
src/java.c
src/meta_data.c
src/plugin.c
src/utils_cache.c

Simple merge
Simple merge
diff --cc src/java.c
Simple merge
diff --cc src/meta_data.c
Simple merge
diff --cc src/plugin.c
Simple merge
Simple merge