Author: ddas
Date: Wed May 8 00:05:18 2013
New Revision: 1480135
URL: http://svn.apache.org/r1480135
Log:
Merge -r 1476394:1476395 from trunk onto branch-2. Fixes HDFS-2576.
Modified:
hadoop/common/branches/branch-2/ (props changed)
hadoop/common/branches/branch-2/hadoop-project/ (props changed)
hadoop/common/branches/branch-2/hadoop-project/src/site/ (props changed)
Propchange: hadoop/common/branches/branch-2/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1476395
Propchange: hadoop/common/branches/branch-2/hadoop-project/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-project:r1476395
Propchange: hadoop/common/branches/branch-2/hadoop-project/src/site/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-project/src/site:r1476395
