Author: atm Date: Thu Sep 15 23:07:48 2011 New Revision: 1171315 URL: http://svn.apache.org/viewvc?rev=1171315&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 Thu Sep 15 23:07:48 2011
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1170371
+/hadoop/common/trunk:1152502-1171312
