Author: todd
Date: Thu Oct 11 08:11:51 2012
New Revision: 1396943
URL: http://svn.apache.org/viewvc?rev=1396943&view=rev
Log:
Merge HDFS-3077 into 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)
hadoop/common/trunk/hadoop-mapreduce-project/src/c++/ (props changed)
hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/ (props changed)
hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/block_forensics/
(props changed)
hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build-contrib.xml
(props changed)
hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build.xml (props
changed)
hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/data_join/
(props changed)
hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/eclipse-plugin/
(props changed)
hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/index/ (props
changed)
hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/vaidya/ (props
changed)
hadoop/common/trunk/hadoop-mapreduce-project/src/examples/ (props changed)
hadoop/common/trunk/hadoop-mapreduce-project/src/java/ (props changed)
hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/ (props
changed)
hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/
(props changed)
hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/
(props changed)
hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/
(props changed)
hadoop/common/trunk/hadoop-mapreduce-project/src/webapps/job/ (props
changed)
Propchange: hadoop/common/trunk/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-3077/hadoop-mapreduce-project:r1363593-1396941
Propchange: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-3077/hadoop-mapreduce-project/CHANGES.txt:r1363593-1396941
Propchange: hadoop/common/trunk/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-3077/hadoop-mapreduce-project/conf:r1363593-1396941
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-3077/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1363593-1396941
Propchange: hadoop/common/trunk/hadoop-mapreduce-project/src/c++/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-3077/hadoop-mapreduce-project/src/c++:r1363593-1396941
Propchange: hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-3077/hadoop-mapreduce-project/src/contrib:r1363593-1396941
Propchange:
hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/block_forensics/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-3077/hadoop-mapreduce-project/src/contrib/block_forensics:r1363593-1396941
Propchange:
hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build-contrib.xml
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-3077/hadoop-mapreduce-project/src/contrib/build-contrib.xml:r1363593-1396941
Propchange: hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/build.xml
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-3077/hadoop-mapreduce-project/src/contrib/build.xml:r1363593-1396941
Propchange: hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/data_join/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-3077/hadoop-mapreduce-project/src/contrib/data_join:r1363593-1396941
Propchange:
hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/eclipse-plugin/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-3077/hadoop-mapreduce-project/src/contrib/eclipse-plugin:r1363593-1396941
Propchange: hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/index/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-3077/hadoop-mapreduce-project/src/contrib/index:r1363593-1396941
Propchange: hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/vaidya/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-3077/hadoop-mapreduce-project/src/contrib/vaidya:r1363593-1396941
Propchange: hadoop/common/trunk/hadoop-mapreduce-project/src/examples/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-3077/hadoop-mapreduce-project/src/examples:r1363593-1396941
Propchange: hadoop/common/trunk/hadoop-mapreduce-project/src/java/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-3077/hadoop-mapreduce-project/src/java:r1363593-1396941
Propchange: hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-3077/hadoop-mapreduce-project/src/test/mapred:r1363593-1396941
Propchange:
hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-3077/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs:r1363593-1396941
Propchange:
hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-3077/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs:r1363593-1396941
Propchange:
hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-3077/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc:r1363593-1396941
Propchange: hadoop/common/trunk/hadoop-mapreduce-project/src/webapps/job/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-3077/hadoop-mapreduce-project/src/webapps/job:r1363593-1396941
