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 57E851064A for ; Tue, 11 Jun 2013 21:01:15 +0000 (UTC) Received: (qmail 48823 invoked by uid 500); 11 Jun 2013 21:01:15 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 48780 invoked by uid 500); 11 Jun 2013 21:01:15 -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 48773 invoked by uid 99); 11 Jun 2013 21:01:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Jun 2013 21:01:15 +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, 11 Jun 2013 21:01:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3A3DD23888FE; Tue, 11 Jun 2013 21:00:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1491955 - in /hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common: CHANGES.txt src/main/conf/hadoop-env.cmd Date: Tue, 11 Jun 2013 21:00:53 -0000 To: common-commits@hadoop.apache.org From: arpit@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130611210054.3A3DD23888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: arpit Date: Tue Jun 11 21:00:53 2013 New Revision: 1491955 URL: http://svn.apache.org/r1491955 Log: HADOOP-9532. Merging change r1491953 from branch-2 to branch-2.1-beta Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1491955&r1=1491954&r2=1491955&view=diff ============================================================================== --- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jun 11 21:00:53 2013 @@ -226,6 +226,9 @@ Release 2.1.0-beta - UNRELEASED HADOOP-9581. hadoop --config non-existent directory should result in error (Ashwin Shankar via jlowe) + + HADOOP-9532. HADOOP_CLIENT_OPTS is appended twice by Windows cmd scripts. + (Chris Nauroth via suresh) BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS @@ -379,9 +382,8 @@ Release 2.1.0-beta - UNRELEASED HADOOP-9413. Add common utils for File#setReadable/Writable/Executable & File#canRead/Write/Execute that work cross-platform. (Ivan Mitic via suresh) - - HADOOP-9532. HADOOP_CLIENT_OPTS is appended twice by Windows cmd scripts. - (Chris Nauroth via suresh) + +Release 2.0.5-beta - UNRELEASED HADOOP-9043. Disallow in winutils creating symlinks with forwards slashes. (Chris Nauroth and Arpit Agarwal via suresh) Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd?rev=1491955&r1=1491954&r2=1491955&view=diff ============================================================================== --- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd (original) +++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd Tue Jun 11 21:00:53 2013 @@ -43,7 +43,7 @@ if exist %HADOOP_HOME%\contrib\capacity- @rem set HADOOP_NAMENODE_INIT_HEAPSIZE="" @rem Extra Java runtime options. Empty by default. -@rem set HADOOP_OPTS=-Djava.net.preferIPv4Stack=true %HADOOP_CLIENT_OPTS% +@rem set HADOOP_OPTS=-Djava.net.preferIPv4Stack=true @rem Command specific options appended to HADOOP_OPTS when specified if not defined HADOOP_SECURITY_LOGGER (