Return-Path: 
 <commits-return-29135-apmail-hbase-commits-archive=hbase.apache.org@hbase.apache.org>
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 9C26B18371
	for <apmail-hbase-commits-archive@www.apache.org>;
 Sun, 22 Nov 2015 22:40:17 +0000 (UTC)
Received: (qmail 93175 invoked by uid 500); 22 Nov 2015 22:40:15 -0000
Delivered-To: apmail-hbase-commits-archive@hbase.apache.org
Received: (qmail 92966 invoked by uid 500); 22 Nov 2015 22:40:15 -0000
Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hbase.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hbase.apache.org>
List-Post: <mailto:commits@hbase.apache.org>
List-Id: <commits.hbase.apache.org>
Reply-To: dev@hbase.apache.org
Delivered-To: mailing list commits@hbase.apache.org
Received: (qmail 89429 invoked by uid 99); 22 Nov 2015 22:40:12 -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; Sun, 22 Nov 2015 22:40:12 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 866B1E0A50; Sun, 22 Nov 2015 22:40:12 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: misty@apache.org
To: commits@hbase.apache.org
Date: Sun, 22 Nov 2015 22:40:44 -0000
Message-Id: <0ebd6ed6bc8544909c759c1c555c3337@git.apache.org>
In-Reply-To: <9992cfe48d434570abd843a624c1b57d@git.apache.org>
References: <9992cfe48d434570abd843a624c1b57d@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [34/51] [partial] hbase git commit: Published site at
 86be690b0723e814a655ad0ae8a6577d7111c1f2.

http://git-wip-us.apache.org/repos/asf/hbase/blob/155d5cd0/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.CompactType.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.CompactType.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.CompactType.html
index 28c3760..ec8ddb6 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.CompactType.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.CompactType.html
@@ -872,13 +872,13 @@
 <span class="sourceLineNo">864</span>  /**<a name="line.864"></a>
 <span class="sourceLineNo">865</span>   * Merge two regions. Asynchronous operation.<a name="line.865"></a>
 <span class="sourceLineNo">866</span>   *<a name="line.866"></a>
-<span class="sourceLineNo">867</span>   * @param encodedNameOfRegionA encoded name of region a<a name="line.867"></a>
-<span class="sourceLineNo">868</span>   * @param encodedNameOfRegionB encoded name of region b<a name="line.868"></a>
+<span class="sourceLineNo">867</span>   * @param nameOfRegionA encoded or full name of region a<a name="line.867"></a>
+<span class="sourceLineNo">868</span>   * @param nameOfRegionB encoded or full name of region b<a name="line.868"></a>
 <span class="sourceLineNo">869</span>   * @param forcible true if do a compulsory merge, otherwise we will only merge two adjacent<a name="line.869"></a>
 <span class="sourceLineNo">870</span>   * regions<a name="line.870"></a>
 <span class="sourceLineNo">871</span>   * @throws IOException<a name="line.871"></a>
 <span class="sourceLineNo">872</span>   */<a name="line.872"></a>
-<span class="sourceLineNo">873</span>  void mergeRegions(final byte[] encodedNameOfRegionA, final byte[] encodedNameOfRegionB,<a name="line.873"></a>
+<span class="sourceLineNo">873</span>  void mergeRegions(final byte[] nameOfRegionA, final byte[] nameOfRegionB,<a name="line.873"></a>
 <span class="sourceLineNo">874</span>      final boolean forcible) throws IOException;<a name="line.874"></a>
 <span class="sourceLineNo">875</span><a name="line.875"></a>
 <span class="sourceLineNo">876</span>  /**<a name="line.876"></a>

http://git-wip-us.apache.org/repos/asf/hbase/blob/155d5cd0/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.html
index 28c3760..ec8ddb6 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.html
@@ -872,13 +872,13 @@
 <span class="sourceLineNo">864</span>  /**<a name="line.864"></a>
 <span class="sourceLineNo">865</span>   * Merge two regions. Asynchronous operation.<a name="line.865"></a>
 <span class="sourceLineNo">866</span>   *<a name="line.866"></a>
-<span class="sourceLineNo">867</span>   * @param encodedNameOfRegionA encoded name of region a<a name="line.867"></a>
-<span class="sourceLineNo">868</span>   * @param encodedNameOfRegionB encoded name of region b<a name="line.868"></a>
+<span class="sourceLineNo">867</span>   * @param nameOfRegionA encoded or full name of region a<a name="line.867"></a>
+<span class="sourceLineNo">868</span>   * @param nameOfRegionB encoded or full name of region b<a name="line.868"></a>
 <span class="sourceLineNo">869</span>   * @param forcible true if do a compulsory merge, otherwise we will only merge two adjacent<a name="line.869"></a>
 <span class="sourceLineNo">870</span>   * regions<a name="line.870"></a>
 <span class="sourceLineNo">871</span>   * @throws IOException<a name="line.871"></a>
 <span class="sourceLineNo">872</span>   */<a name="line.872"></a>
-<span class="sourceLineNo">873</span>  void mergeRegions(final byte[] encodedNameOfRegionA, final byte[] encodedNameOfRegionB,<a name="line.873"></a>
+<span class="sourceLineNo">873</span>  void mergeRegions(final byte[] nameOfRegionA, final byte[] nameOfRegionB,<a name="line.873"></a>
 <span class="sourceLineNo">874</span>      final boolean forcible) throws IOException;<a name="line.874"></a>
 <span class="sourceLineNo">875</span><a name="line.875"></a>
 <span class="sourceLineNo">876</span>  /**<a name="line.876"></a>