You are viewing a plain text version of this content. The canonical link for it is here.

Posted to mapreduce-commits@hadoop.apache.org by su...@apache.org on 2013/05/23 23:09:51 UTC

svn commit: r1485852 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

Author: suresh
Date: Thu May 23 21:09:50 2013
New Revision: 1485852

URL: http://svn.apache.org/r1485852
Log:
HADOOP-9372. Merge r1453637 from trunk

Modified:
    hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1485852&r1=1485851&r2=1485852&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Thu May 23 21:09:50 2013
@@ -306,7 +306,10 @@ Release 2.0.5-beta - UNRELEASED
     MAPREDUCE-4983. Fixed various platform specific assumptions in various tests,
     so that they can pass on Windows too. (Chris Nauroth via vinodkv)
 
-Release 2.0.4-alpha - 2013-04-25
+    HADOOP-9372. Fix bad timeout annotations on tests.
+    (Arpit Agarwal via suresh)
+
+Release 2.0.4-beta - UNRELEASED
 
   INCOMPATIBLE CHANGES