Author: atm Date: Thu Feb 23 16:06:53 2012 New Revision: 1292838 URL: http://svn.apache.org/viewvc?rev=1292838&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 Feb 23 16:06:53 2012
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1292323
+/hadoop/common/trunk:1152502-1292826
