Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-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 0AC9B11BA1 for ; Thu, 24 Jul 2014 17:48:15 +0000 (UTC) Received: (qmail 19262 invoked by uid 500); 24 Jul 2014 17:48:14 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 19186 invoked by uid 500); 24 Jul 2014 17:48:14 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 19177 invoked by uid 99); 24 Jul 2014 17:48:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Jul 2014 17:48:14 +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; Thu, 24 Jul 2014 17:48:16 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4002B2388A3B; Thu, 24 Jul 2014 17:47:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Thu, 24 Jul 2014 17:47:51 -0000 To: common-commits@hadoop.apache.org From: arp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140724174751.4002B2388A3B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on 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 *

ToolRunner can be used to run classes implementing * Tool interface. It works in conjunction with * {@link GenericOptionsParser} to parse the - * + * * generic hadoop command line arguments and modifies the * Configuration of the Tool. The * application-specific options are passed along without being modified.