Author: atm Date: Tue Jan 24 17:59:14 2012 New Revision: 1235380 URL: http://svn.apache.org/viewvc?rev=1235380&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 Tue Jan 24 17:59:14 2012
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1235069
+/hadoop/common/trunk:1152502-1235379
