svn commit: r1559794 - in /hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common: CHANGES.txt src/main/docs/ src/main/java/ src/test/core/

[cnauroth]

Author: cnauroth
Date: Mon Jan 20 18:02:27 2014
New Revision: 1559794

URL: http://svn.apache.org/r1559794
Log:
Merge trunk to HDFS-4685.

Modified:
    
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/CHANGES.txt
   (props changed)
    
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/docs/
   (props changed)
    
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/
   (props changed)
    
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/test/core/
   (props changed)

Propchange: 
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
  Merged 
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1559324-1559793

Propchange: 
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
  Merged 
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1559324-1559793

Propchange: 
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
  Merged 
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1559324-1559793

Propchange: 
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
  Merged 
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1559324-1559793