Author: umamahesh
Date: Sat May 3 02:29:37 2014
New Revision: 1592140
URL: http://svn.apache.org/r1592140
Log:
Merge back from trunk to HDFS-2006
Modified:
hadoop/common/branches/HDFS-2006/hadoop-mapreduce-project/ (props changed)
hadoop/common/branches/HDFS-2006/hadoop-mapreduce-project/CHANGES.txt
(props changed)
hadoop/common/branches/HDFS-2006/hadoop-mapreduce-project/conf/ (props
changed)
hadoop/common/branches/HDFS-2006/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
(props changed)
Propchange: hadoop/common/branches/HDFS-2006/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Reverse-merged /hadoop/common/trunk/hadoop-mapreduce-project:r1588992-1590763
Propchange:
hadoop/common/branches/HDFS-2006/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Reverse-merged
/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:r1588992-1590763
Propchange: hadoop/common/branches/HDFS-2006/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
Reverse-merged
/hadoop/common/trunk/hadoop-mapreduce-project/conf:r1588992-1590763
Propchange:
hadoop/common/branches/HDFS-2006/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
------------------------------------------------------------------------------
Reverse-merged
/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1588992-1590763
