From 1e6ea5aab7b0b93536ed11ac527e6f2504745a19 Mon Sep 17 00:00:00 2001 From: Andrew Purtell Date: Thu, 2 Apr 2015 10:33:04 -0700 Subject: [PATCH] Amend HBASE-12975 Supportable SplitTransaction and RegionMergeTransaction interfaces Remove accidentally committed junk file RegionMergeTransactionImpl.java.rej --- .../regionserver/RegionMergeTransactionImpl.java.rej | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java.rej diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java.rej b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java.rej deleted file mode 100644 index 45e9534c47a..00000000000 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java.rej +++ /dev/null @@ -1,10 +0,0 @@ ---- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java -+++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java -@@ -41,6 +41,7 @@ - import org.apache.hadoop.hbase.coordination.BaseCoordinatedStateManager; - import org.apache.hadoop.hbase.coordination.RegionMergeCoordination.RegionMergeDetails; - import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode; -+import org.apache.hadoop.hbase.regionserver.SplitTransactionImpl.JournalEntryImpl; - import org.apache.hadoop.hbase.regionserver.SplitTransactionImpl.LoggingProgressable; - import org.apache.hadoop.hbase.util.Bytes; - import org.apache.hadoop.hbase.util.ConfigUtil;