Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-9532. Merging change r1478072 from trunk to branch-2 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491953 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arpit Gupta 2013-06-11 20:56:09 +00:00
parent 68671e453b
commit 03f6e8ab56
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -253,6 +253,9 @@ Release 2.1.0-beta - UNRELEASED
HADOOP-9581. hadoop --config non-existent directory should result in error HADOOP-9581. hadoop --config non-existent directory should result in error
(Ashwin Shankar via jlowe) (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 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 & HADOOP-9413. Add common utils for File#setReadable/Writable/Executable &
File#canRead/Write/Execute that work cross-platform. (Ivan Mitic via suresh) File#canRead/Write/Execute that work cross-platform. (Ivan Mitic via suresh)
HADOOP-9532. HADOOP_CLIENT_OPTS is appended twice by Windows cmd scripts. Release 2.0.5-beta - UNRELEASED
(Chris Nauroth via suresh)
HADOOP-9043. Disallow in winutils creating symlinks with forwards slashes. HADOOP-9043. Disallow in winutils creating symlinks with forwards slashes.
(Chris Nauroth and Arpit Agarwal via suresh) (Chris Nauroth and Arpit Agarwal via suresh)

2
hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd
View File

@ -43,7 +43,7 @@ if exist %HADOOP_HOME%\contrib\capacity-scheduler (
@rem set HADOOP_NAMENODE_INIT_HEAPSIZE="" @rem set HADOOP_NAMENODE_INIT_HEAPSIZE=""
@rem Extra Java runtime options. Empty by default. @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 @rem Command specific options appended to HADOOP_OPTS when specified
if not defined HADOOP_SECURITY_LOGGER ( if not defined HADOOP_SECURITY_LOGGER (