Author: jing9
Date: Fri Feb 7 18:42:06 2014
New Revision: 1565757
URL: http://svn.apache.org/r1565757
Log:
Merging r1565514 through r1565756 from trunk
Modified:
hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/CHANGES.txt
(props changed)
hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/docs/
(props changed)
hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/core/
(props changed)
Propchange:
hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1565514-1565756
Propchange:
hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1565514-1565756
Propchange:
hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1565514-1565756
Propchange:
hadoop/common/branches/HDFS-5698/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1565514-1565756
