Browse Source

Merge HADOOP-3940 into 0.18 branch

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@692571 13f79535-47bb-0310-9956-ffa450edef68
Christopher Douglas 17 years ago
parent
commit
7d42e3ab1d
1 changed files with 4 additions and 4 deletions
  1. 4 4
      CHANGES.txt

+ 4 - 4
CHANGES.txt

@@ -396,10 +396,6 @@ Trunk (unreleased changes)
     HADOOP-3773. Change Pipes to set the default map output key and value 
     types correctly. (Koji Noguchi via omalley)
 
-    HADOOP-3940. Fix in-memory merge condition to wait when there are no map
-    outputs or when the final map outputs are being fetched without contention.
-    (cdouglas)
-
     HADOOP-3952. Fix compilation error in TestDataJoin referencing dfs package.
     (omalley)
 
@@ -490,6 +486,10 @@ Release 0.18.1 - Unreleased
     HADOOP-4046. Made WritableComparable's constructor protected instead of 
     private to re-enable class derivation. (cdouglas via omalley)
 
+    HADOOP-3940. Fix in-memory merge condition to wait when there are no map
+    outputs or when the final map outputs are being fetched without contention.
+    (cdouglas)
+
 Release 0.18.0 - 2008-08-19
 
   INCOMPATIBLE CHANGES