Author: suresh Date: Sat Apr 20 00:02:43 2013 New Revision: 1470089 URL: http://svn.apache.org/r1470089 Log: Merging trunk after fixing conflict with HDFS-4434.
Modified:
hadoop/common/branches/HDFS-2802/ (props changed)
Propchange: hadoop/common/branches/HDFS-2802/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1469644-1470045
