Author: cnauroth
Date: Wed Feb 26 23:01:58 2014
New Revision: 1572325
URL: http://svn.apache.org/r1572325
Log:
HDFS-4685. Merging change r1572308 and r1572315 from branch-2 to branch-2.4
Modified:
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/ (props
changed)
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/conf/ (props
changed)
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
(props changed)
Propchange: hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-4685/hadoop-mapreduce-project:r1547224-1569863
Propchange: hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-4685/hadoop-mapreduce-project/conf:r1547224-1569863
Propchange:
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-4685/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1547224-1569863
