Author: ddas Date: Wed May 8 00:12:01 2013 New Revision: 1480136 URL: http://svn.apache.org/r1480136 Log: Merge -r 1477848:1477849 from trunk onto branch-2. Fixes HDFS-4778.
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:r1477849 Propchange: hadoop/common/branches/branch-2/hadoop-project/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-project:r1477849 Propchange: hadoop/common/branches/branch-2/hadoop-project/src/site/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-project/src/site:r1477849