Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DAA6D188C1 for ; Mon, 2 Nov 2015 23:39:13 +0000 (UTC) Received: (qmail 41437 invoked by uid 500); 2 Nov 2015 23:39:13 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 41315 invoked by uid 500); 2 Nov 2015 23:39:13 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 41299 invoked by uid 99); 2 Nov 2015 23:39:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Nov 2015 23:39:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6A57DE0998; Mon, 2 Nov 2015 23:39:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: apurtell@apache.org To: commits@hbase.apache.org Date: Mon, 02 Nov 2015 23:39:14 -0000 Message-Id: In-Reply-To: <2ed36befe19042c4b4cd5977bc12b6aa@git.apache.org> References: <2ed36befe19042c4b4cd5977bc12b6aa@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] hbase git commit: HBASE-14631 Addendum restores a method in RegionMergeTransaction 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 Authored: Mon Nov 2 15:31:14 2015 -0800 Committer: Andrew Purtell 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);