Author: cnauroth
Date: Wed Feb 19 18:34:52 2014
New Revision: 1569870
URL: http://svn.apache.org/r1569870
Log:
Merge HDFS-4685 to trunk.
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/ (props changed)
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (props changed)
hadoop/common/trunk/hadoop-mapreduce-project/conf/ (props changed)
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
(props changed)
Propchange: hadoop/common/trunk/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-4685/hadoop-mapreduce-project:r1547224-1569863
Propchange: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-4685/hadoop-mapreduce-project/CHANGES.txt:r1547224-1569863
Propchange: hadoop/common/trunk/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-4685/hadoop-mapreduce-project/conf:r1547224-1569863
Propchange:
hadoop/common/trunk/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
