Author: todd Date: Sat Jan 28 02:50:23 2012 New Revision: 1236965 URL: http://svn.apache.org/viewvc?rev=1236965&view=rev Log: Merge trunk into HA branch.
Modified: hadoop/common/branches/HDFS-1623/ (props changed) Propchange: hadoop/common/branches/HDFS-1623/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 28 02:50:23 2012 @@ -1 +1 @@ -/hadoop/common/trunk:1152502-1236935 +/hadoop/common/trunk:1152502-1236962