You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ha...@apache.org on 2009/03/28 01:08:54 UTC

svn commit: r759404 - in /hadoop/core/branches/branch-0.18: ./ CHANGES.txt

Author: hairong
Date: Sat Mar 28 00:08:53 2009
New Revision: 759404

URL: http://svn.apache.org/viewvc?rev=759404&view=rev
Log:
Merge -r 759397:759398 from main to 0.18

Modified:
    hadoop/core/branches/branch-0.18/   (props changed)
    hadoop/core/branches/branch-0.18/CHANGES.txt   (contents, props changed)

Propchange: hadoop/core/branches/branch-0.18/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 28 00:08:53 2009
@@ -1,2 +1,2 @@
 /hadoop/core/branches/branch-0.19:704733
-/hadoop/core/trunk:699517,700163,704701,704732,705420,705430,707258,709040,720602,723460,723831,723918,743892,753346
+/hadoop/core/trunk:699517,700163,704701,704732,705420,705430,707258,709040,720602,723460,723831,723918,743892,753346,759398

Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=759404&r1=759403&r2=759404&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Sat Mar 28 00:08:53 2009
@@ -16,7 +16,7 @@
     HADOOP-5412. Simulated DataNode should not write to a block that's being
     written by another thread. (hairong)
 
-    HADOOP-5414. Fix the problem of blocks remaining under-replicated by
+    HADOOP-5465. Fix the problem of blocks remaining under-replicated by
     providing synchronized modification to the counter xmitsInProgress in
     DataNode. (hairong)
 

Propchange: hadoop/core/branches/branch-0.18/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 28 00:08:53 2009
@@ -1 +1 @@
-/hadoop/core/trunk/CHANGES.txt:699517,700163,700923,704701,705420,705430,707258,709040,720602,723460,723831,723918,732572,741703,743892,753346
+/hadoop/core/trunk/CHANGES.txt:699517,700163,700923,704701,705420,705430,707258,709040,720602,723460,723831,723918,732572,741703,743892,753346,759398