You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by wa...@apache.org on 2014/03/12 23:56:42 UTC

svn commit: r1576980 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: ./ CHANGES.txt bin/ conf/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml hadoop-mapreduce-examples/

Author: wang
Date: Wed Mar 12 22:56:35 2014
New Revision: 1576980

URL: http://svn.apache.org/r1576980
Log:
HDFS-6079. Timeout for getFileBlockStorageLocations does not work. Contributed by Andrew Wang.

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/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-mapreduce-project:r1576979

Propchange: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:r1576979

Propchange: hadoop/common/branches/branch-2/hadoop-mapreduce-project/bin/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-mapreduce-project/bin:r1576979

Propchange: hadoop/common/branches/branch-2/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-mapreduce-project/conf:r1576979

Propchange: hadoop/common/branches/branch-2/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:r1576979

Propchange: hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-examples:r1576979