You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/04/02 19:33:18 UTC
hbase git commit: Amend HBASE-12975 Supportable SplitTransaction and
RegionMergeTransaction interfaces
Repository: hbase
Updated Branches:
refs/heads/master f210c2ebb -> 1e6ea5aab
Amend HBASE-12975 Supportable SplitTransaction and RegionMergeTransaction interfaces
Remove accidentally committed junk file RegionMergeTransactionImpl.java.rej
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1e6ea5aa
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1e6ea5aa
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1e6ea5aa
Branch: refs/heads/master
Commit: 1e6ea5aab7b0b93536ed11ac527e6f2504745a19
Parents: f210c2e
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu Apr 2 10:33:04 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Apr 2 10:33:04 2015 -0700
----------------------------------------------------------------------
.../regionserver/RegionMergeTransactionImpl.java.rej | 10 ----------
1 file changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/1e6ea5aa/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 45e9534..0000000
--- 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;