Code

Merge branch 'collectd-4.6' into collectd-4.7
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 4 May 2009 14:57:10 +0000 (16:57 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 4 May 2009 14:57:10 +0000 (16:57 +0200)
Conflicts:
src/filter_chain.c
src/meta_data.c
src/target_notification.c
src/target_replace.c
src/target_set.c

1  2 
src/bind.c
src/memory.c

diff --cc src/bind.c
Simple merge
diff --cc src/memory.c
Simple merge