You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2014/02/25 21:17:15 UTC
svn commit: r1571809 -
/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java
Author: stack
Date: Tue Feb 25 20:17:15 2014
New Revision: 1571809
URL: http://svn.apache.org/r1571809
Log:
HBASE-10604 Fix parseArgs javadoc (Jean-Marc Spaggiari)
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java?rev=1571809&r1=1571808&r2=1571809&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/Merge.java Tue Feb 25 20:17:15 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
*/