Author: arp Date: Tue Sep 3 23:15:28 2013 New Revision: 1519882 URL: http://svn.apache.org/r1519882 Log: Merge r1518851 from trunk (reconcile branch conflicts with the fix for HDFS-5077)
Modified:
hadoop/common/branches/HDFS-2832/ (props changed)
Propchange: hadoop/common/branches/HDFS-2832/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1518851
