You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2014/07/22 18:58:13 UTC
svn commit: r1612611 - in
/hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common:
CHANGES.txt src/main/java/org/apache/hadoop/util/Tool.java
Author: arp
Date: Tue Jul 22 16:58:13 2014
New Revision: 1612611
URL: http://svn.apache.org/r1612611
Log:
HADOOP-10864: Merging r1612610 from branch-2 to branch-2.5.
Modified:
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Tool.java
Modified: hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1612611&r1=1612610&r2=1612611&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jul 22 16:58:13 2014
@@ -330,6 +330,9 @@ Release 2.5.0 - UNRELEASED
HADOOP-10710. hadoop.auth cookie is not properly constructed according to
RFC2109. (Juan Yu via tucu)
+ HADOOP-10864. Tool documentenation is broken. (Akira Ajisaka
+ via Arpit Agarwal)
+
Release 2.4.1 - 2014-06-23
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Tool.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Tool.java?rev=1612611&r1=1612610&r2=1612611&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Tool.java (original)
+++ hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Tool.java Tue Jul 22 16:58:13 2014
@@ -27,7 +27,7 @@ import org.apache.hadoop.conf.Configurab
*
* <p><code>Tool</code>, is the standard for any Map-Reduce tool/application.
* The tool/application should delegate the handling of
- * <a href="{@docRoot}/org/apache/hadoop/util/GenericOptionsParser.html#GenericOptions">
+ * <a href="{@docRoot}/../hadoop-project-dist/hadoop-common/CommandsManual.html#Generic_Options">
* standard command-line options</a> to {@link ToolRunner#run(Tool, String[])}
* and only handle its custom arguments.</p>
*