hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject svn commit: r1235078 - /hadoop/common/branches/HDFS-1623/
Date Tue, 24 Jan 2012 00:00:07 GMT
Author: todd
Date: Tue Jan 24 00:00:05 2012
New Revision: 1235078

URL: http://svn.apache.org/viewvc?rev=1235078&view=rev
Log:
Merge trunk into HA branch.

- Some conflicts on BlockManager due to the recent commit of HDFS-2822 - moved logic to processMisReplicatedBlock
function
- testNoExtensionIfNoBlocks(org.apache.hadoop.hdfs.TestSafeMode) is now failing due to an
existing bug in the HA branch, to be fixed soon 

Modified:
    hadoop/common/branches/HDFS-1623/   (props changed)

Propchange: hadoop/common/branches/HDFS-1623/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 24 00:00:05 2012
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1234923
+/hadoop/common/trunk:1152502-1235069



Mime
View raw message