Author: umamahesh
Date: Sat May 3 02:29:37 2014
New Revision: 1592140
URL: http://svn.apache.org/r1592140
Log:
Merge back from trunk to HDFS-2006
Modified:
hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/CHANGES.txt
(props changed)
hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/docs/
(props changed)
hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/test/core/
(props changed)
Propchange:
hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Reverse-merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1588992-1590763
Propchange:
hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
Reverse-merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1588992-1590763
Propchange:
hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Reverse-merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1588992-1590763
Propchange:
hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
Reverse-merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1588992-1590763
