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 su...@apache.org on 2013/10/11 00:09:38 UTC

svn commit: r1531129 - in /hadoop/common/branches/branch-2.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: suresh
Date: Thu Oct 10 22:09:37 2013
New Revision: 1531129

URL: http://svn.apache.org/r1531129
Log:
HADOOP-10029. Merging change 1531126 from branch-2.

Modified:
    hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/   (props changed)
    hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/CHANGES.txt   (props changed)
    hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/bin/   (props changed)
    hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/conf/   (props changed)
    hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml   (props changed)
    hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/hadoop-mapreduce-examples/   (props changed)

Propchange: hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-mapreduce-project:r1531125

Propchange: hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:r1531125

Propchange: hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/bin/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-mapreduce-project/bin:r1531125

Propchange: hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-mapreduce-project/conf:r1531125

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

Propchange: hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/hadoop-mapreduce-examples/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-examples:r1531125