Author: wang
Date: Fri Oct 25 01:56:56 2013
New Revision: 1535608
URL: http://svn.apache.org/r1535608
Log:
merge trunk to hdfs-4949 branch
Modified:
hadoop/common/branches/HDFS-4949/hadoop-mapreduce-project/ (props changed)
hadoop/common/branches/HDFS-4949/hadoop-mapreduce-project/CHANGES.txt
(props changed)
hadoop/common/branches/HDFS-4949/hadoop-mapreduce-project/conf/ (props
changed)
hadoop/common/branches/HDFS-4949/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
(props changed)
Propchange: hadoop/common/branches/HDFS-4949/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-mapreduce-project:r1535560-1535607
Propchange:
hadoop/common/branches/HDFS-4949/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:r1535560-1535607
Propchange: hadoop/common/branches/HDFS-4949/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-mapreduce-project/conf:r1535560-1535607
Propchange:
hadoop/common/branches/HDFS-4949/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1535560-1535607
