Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.java (revision 1507880) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.java (working copy) @@ -66,7 +66,7 @@ this.region_b = region_b; this.forcible = forcible; this.timeout = server.getConfiguration().getInt( - "hbase.master.regionmerge.timeout", 30 * 1000); + "hbase.master.regionmerge.timeout", 120 * 1000); } @Override