hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apurt...@apache.org
Subject [2/2] hbase git commit: HBASE-14631 Addendum restores a method in RegionMergeTransaction
Date Mon, 02 Nov 2015 23:39:14 GMT
HBASE-14631 Addendum restores a method in RegionMergeTransaction


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/34abb947
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/34abb947
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/34abb947

Branch: refs/heads/0.98
Commit: 34abb947b03aa8107e17a1ccc33630168114c79d
Parents: 7bc2257
Author: Andrew Purtell <apurtell@apache.org>
Authored: Mon Nov 2 15:31:14 2015 -0800
Committer: Andrew Purtell <apurtell@apache.org>
Committed: Mon Nov 2 15:31:47 2015 -0800

----------------------------------------------------------------------
 .../hadoop/hbase/regionserver/RegionMergeTransaction.java      | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/34abb947/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java
index 1879dc0..b61288c 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransaction.java
@@ -295,6 +295,12 @@ public class RegionMergeTransaction {
     return mergedRegion;
   }
 
+  @Deprecated
+  public void stepsAfterPONR(final Server server, final RegionServerServices services,
+      final HRegion mergedRegion) throws IOException {
+    stepsAfterPONR(server, services, mergedRegion, null);
+  }
+
   public void stepsAfterPONR(final Server server, final RegionServerServices services,
       final HRegion mergedRegion, User user) throws IOException {
     openMergedRegion(server, services, mergedRegion);


Mime
View raw message