Author: wang
Date: Tue Mar 11 00:40:46 2014
New Revision: 1576155
URL: http://svn.apache.org/r1576155
Log:
Revert bad HDFS-3405 merge from trunk to retry
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/ (props changed)
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(props changed)
hadoop/common/branches/branch-2/hadoop-mapreduce-project/bin/ (props
changed)
hadoop/common/branches/branch-2/hadoop-mapreduce-project/conf/ (props
changed)
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
(props changed)
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/
(props changed)
Propchange: hadoop/common/branches/branch-2/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Reverse-merged /hadoop/common/trunk/hadoop-mapreduce-project:r1575611
Propchange: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Reverse-merged
/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:r1575611
Propchange: hadoop/common/branches/branch-2/hadoop-mapreduce-project/bin/
------------------------------------------------------------------------------
Reverse-merged /hadoop/common/trunk/hadoop-mapreduce-project/bin:r1575611
Propchange: hadoop/common/branches/branch-2/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
Reverse-merged /hadoop/common/trunk/hadoop-mapreduce-project/conf:r1575611
Propchange:
hadoop/common/branches/branch-2/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:r1575611
Propchange:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/
------------------------------------------------------------------------------
Reverse-merged
/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-examples:r1575611
