Author: cnauroth
Date: Mon Oct 14 17:15:53 2013
New Revision: 1531985
URL: http://svn.apache.org/r1531985
Log:
HADOOP-10040. Merging change r1531984 from branch-2 to branch-2.2
Modified:
hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/bin/mapred-config.cmd
(props changed)
hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/bin/mapred.cmd
(props changed)
hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/conf/mapred-env.cmd
(props changed)
Propchange:
hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/bin/mapred-config.cmd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/bin/mapred.cmd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/conf/mapred-env.cmd
------------------------------------------------------------------------------
svn:eol-style = native
