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-common-project/hadoop-common/CHANGES.txt
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1485852&r1=1485851&r2=1485852&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Thu May 23 21:09:50 2013
@@ -304,7 +304,10 @@ Release 2.0.5-beta - UNRELEASED
HADOOP-9373. Merge CHANGES.branch-trunk-win.txt to CHANGES.txt.
(suresh)
-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
