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 2013/06/11 22:56:09 UTC
svn commit: r1491953 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:
CHANGES.txt src/main/conf/hadoop-env.cmd
Author: arpit
Date: Tue Jun 11 20:56:09 2013
New Revision: 1491953
URL: http://svn.apache.org/r1491953
Log:
HADOOP-9532. Merging change r1478072 from trunk to branch-2
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1491953&r1=1491952&r2=1491953&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jun 11 20:56:09 2013
@@ -253,6 +253,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
@@ -406,9 +409,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/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd?rev=1491953&r1=1491952&r2=1491953&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd Tue Jun 11 20:56:09 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 (