You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2013/12/12 08:17:53 UTC
svn commit: r1550363 - in
/hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt
src/main/docs/ src/main/java/ src/test/core/
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-common-project/hadoop-common/CHANGES.txt (props changed)
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs/ (props changed)
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/ (props changed)
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core/ (props changed)
Propchange: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt:r1513717-1550362
Propchange: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/docs:r1513717-1550362
Propchange: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java:r1513717-1550362
Propchange: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/test/core:r1513717-1550362