hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1550363 - in /hadoop/common/trunk/hadoop-mapreduce-project: ./ CHANGES.txt conf/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
Date Thu, 12 Dec 2013 07:20:37 GMT
Author: arp
Date: Thu Dec 12 07:17:51 2013
New Revision: 1550363

URL: http://svn.apache.org/r1550363
Log:
svn merge --reintegrate https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832
for merging Heterogeneous Storage 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-2832/hadoop-mapreduce-project:r1513717-1550362

Propchange: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/HDFS-2832/hadoop-mapreduce-project/CHANGES.txt:r1513717-1550362

Propchange: hadoop/common/trunk/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/HDFS-2832/hadoop-mapreduce-project/conf:r1513717-1550362

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-2832/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1513717-1550362



Mime
View raw message