Author: ddas Date: Thu May 3 17:22:13 2012 New Revision: 1333559 URL: http://svn.apache.org/viewvc?rev=1333559&view=rev Log: Merge -r 1333556:1333557 from hadoop-trunk onto branch-2. Fixes HADOOP-8346.
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:r1333557 Propchange: hadoop/common/branches/branch-2/hadoop-project/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-project:r1333557 Propchange: hadoop/common/branches/branch-2/hadoop-project/src/site/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-project/src/site:r1333557