Author: szetszwo
Date: Thu May 9 23:55:49 2013
New Revision: 1480838
URL: http://svn.apache.org/r1480838
Log:
svn merge --reintegrate
https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802 for merging
HDFS Snapshot feature branch.
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-2802/hadoop-mapreduce-project:r1360400-1480829
Propchange: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project/CHANGES.txt:r1360400-1480829
Propchange: hadoop/common/trunk/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-2802/hadoop-mapreduce-project/conf:r1360400-1480829
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-2802/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1360400-1480829
