Return-Path: 
 <commits-return-17184-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 44C1E10F70
	for <apmail-hbase-commits-archive@www.apache.org>;
 Tue, 25 Feb 2014 20:17:53 +0000 (UTC)
Received: (qmail 25248 invoked by uid 500); 25 Feb 2014 20:17:52 -0000
Delivered-To: apmail-hbase-commits-archive@hbase.apache.org
Received: (qmail 25182 invoked by uid 500); 25 Feb 2014 20:17:52 -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 25174 invoked by uid 99); 25 Feb 2014 20:17:52 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Feb 2014 20:17:52 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Feb 2014 20:17:51 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 4041923889BB;
	Tue, 25 Feb 2014 20:17:31 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1571810 -
 /hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java
Date: Tue, 25 Feb 2014 20:17:31 -0000
To: commits@hbase.apache.org
From: stack@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140225201731.4041923889BB@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: stack
Date: Tue Feb 25 20:17:30 2014
New Revision: 1571810

URL: http://svn.apache.org/r1571810
Log:
HBASE-10604 Fix parseArgs javadoc (Jean-Marc Spaggiari)

Modified:
    hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java

Modified: hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java?rev=1571810&r1=1571809&r2=1571810&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java (original)
+++ hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java Tue Feb 25 20:17:30 2014
@@ -228,11 +228,9 @@ public class Merge extends Configured im
   }
 
   /*
-   * Adds a region's meta information from the passed <code>meta</code>
-   * region.
+   * Parse given arguments including generic arguments and assign table name and regions names.
    *
-   * @param metainfo hbase:meta HRegionInfo to be updated
-   * @param region HRegion to add to <code>meta</code>
+   * @param args the arguments to parse
    *
    * @throws IOException
    */