From 13c7a2ac3154e44dd83d330164785e6a31c10e5b Mon Sep 17 00:00:00 2001
From: Bela Ban <belaban@yahoo.com>
Date: Wed, 1 Feb 2012 15:50:56 +0100
Subject: [PATCH] changed to use MERGE3

---
 conf/fast-local.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/fast-local.xml b/conf/fast-local.xml
index a14b25dfe75..381ff1fd0b2 100644
--- a/conf/fast-local.xml
+++ b/conf/fast-local.xml
@@ -51,7 +51,7 @@
 
     <PING timeout="2000"
             num_initial_members="3"/>
-    <MERGE2 max_interval="30000"
+    <MERGE3 max_interval="30000"
             min_interval="10000"/>
     <FD_SOCK/>
     <FD_ALL/>