hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apurt...@apache.org
Subject [6/6] hbase git commit: HBASE-14631 Addendum restores a method in RegionMergeTransactionImpl
Date Tue, 03 Nov 2015 00:07:47 GMT
HBASE-14631 Addendum restores a method in RegionMergeTransactionImpl


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

Branch: refs/heads/branch-1.1
Commit: 074d512fa67f7a00d2fd3771d56c383d9c7da299
Parents: 79b6b91
Author: Andrew Purtell <apurtell@apache.org>
Authored: Mon Nov 2 15:54:28 2015 -0800
Committer: Andrew Purtell <apurtell@apache.org>
Committed: Mon Nov 2 15:54:40 2015 -0800

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


http://git-wip-us.apache.org/repos/asf/hbase/blob/074d512f/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java
index b42fa55..03aa059 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java
@@ -302,6 +302,12 @@ public class RegionMergeTransactionImpl implements 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