svn commit: r1613203 - in /hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/util/ToolRunner.java

[ar...@apache.org]

Author: arp
Date: Thu Jul 24 17:47:50 2014
New Revision: 1613203

URL: http://svn.apache.org/r1613203
Log:
HADOOP-10894: Merging r1613201 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/ToolRunner.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=1613203&r1=1613202&r2=1613203&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 Thu Jul 24 17:47:50 2014
@@ -339,6 +339,9 @@ Release 2.5.0 - UNRELEASED
     HADOOP-10890. TestDFVariations.testMount fails intermittently. (Yongjun
     Zhang via Arpit Agarwal)
 
+    HADOOP-10894. Fix dead link in ToolRunner documentation. (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/ToolRunner.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/ToolRunner.java?rev=1613203&r1=1613202&r2=1613203&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ToolRunner.java (original)
+++ hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ToolRunner.java Thu Jul 24 17:47:50 2014
@@ -30,7 +30,7 @@ import org.apache.hadoop.conf.Configurat
  * <p><code>ToolRunner</code> can be used to run classes implementing 
  * <code>Tool</code> interface. It works in conjunction with 
  * {@link GenericOptionsParser} to parse the 
- * <a href="{@docRoot}/org/apache/hadoop/util/GenericOptionsParser.html#GenericOptions">
+ * <a href="{@docRoot}/../hadoop-project-dist/hadoop-common/CommandsManual.html#Generic_Options">
  * generic hadoop command line arguments</a> and modifies the 
  * <code>Configuration</code> of the <code>Tool</code>. The 
  * application-specific options are passed along without being modified.