From 5801832673afaaee5b318fb86d9f64327ac851ae Mon Sep 17 00:00:00 2001 From: Yi Liang Date: Thu, 10 Aug 2017 11:15:59 -0700 Subject: [PATCH] HBASE-18557: Change splitable to mergeable in MergeTableRegionsProcedure --- .../hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java index 74d9b75..9aaf297 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java @@ -513,7 +513,7 @@ public class MergeTableRegionsProcedure throws IOException { GetRegionInfoResponse response = Util.getRegionInfoResponse(env, rs.getServerName(), rs.getRegion()); - return response.hasSplittable() && response.getSplittable(); + return response.hasMergeable() && response.getMergeable(); } /** -- 2.10.1