Author: wang
Date: Wed Mar 12 22:57:55 2014
New Revision: 1576983
URL: http://svn.apache.org/r1576983
Log:
HDFS-6079. Timeout for getFileBlockStorageLocations does not work. Contributed
by Andrew Wang.
Modified:
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/ (props
changed)
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt
(props changed)
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/bin/ (props
changed)
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/conf/ (props
changed)
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
(props changed)
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-examples/
(props changed)
Propchange: hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project:r1576980
Merged /hadoop/common/trunk/hadoop-mapreduce-project:r1576979
Propchange:
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt:r1576980
Merged /hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:r1576979
Propchange: hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/bin/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-mapreduce-project/bin:r1576979
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/bin:r1576980
Propchange: hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/conf:r1576980
Merged /hadoop/common/trunk/hadoop-mapreduce-project/conf:r1576979
Propchange:
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1576980
Merged
/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1576979
Propchange:
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-examples/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples:r1576980
Merged
/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-examples:r1576979
