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 wa...@apache.org on 2013/10/25 03:56:57 UTC
svn commit: r1535608 - in
/hadoop/common/branches/HDFS-4949/hadoop-common-project/hadoop-common:
CHANGES.txt src/main/docs/ src/main/java/ src/test/core/
Author: wang
Date: Fri Oct 25 01:56:56 2013
New Revision: 1535608
URL: http://svn.apache.org/r1535608
Log:
merge trunk to hdfs-4949 branch
Modified:
hadoop/common/branches/HDFS-4949/hadoop-common-project/hadoop-common/CHANGES.txt (props changed)
hadoop/common/branches/HDFS-4949/hadoop-common-project/hadoop-common/src/main/docs/ (props changed)
hadoop/common/branches/HDFS-4949/hadoop-common-project/hadoop-common/src/main/java/ (props changed)
hadoop/common/branches/HDFS-4949/hadoop-common-project/hadoop-common/src/test/core/ (props changed)
Propchange: hadoop/common/branches/HDFS-4949/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1535560-1535607
Propchange: hadoop/common/branches/HDFS-4949/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1535560-1535607
Propchange: hadoop/common/branches/HDFS-4949/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1535560-1535607
Propchange: hadoop/common/branches/HDFS-4949/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1535560-1535607