HADOOP-9372. Merge r1453637 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485852 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2013-05-23 21:09:50 +00:00
parent 3eb800f539
commit 84b91e1b01
2 changed files with 8 additions and 2 deletions

View File

@ -304,7 +304,10 @@ Release 2.0.5-beta - UNRELEASED
HADOOP-9373. Merge CHANGES.branch-trunk-win.txt to CHANGES.txt. HADOOP-9373. Merge CHANGES.branch-trunk-win.txt to CHANGES.txt.
(suresh) (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 INCOMPATIBLE CHANGES

View File

@ -306,7 +306,10 @@ Release 2.0.5-beta - UNRELEASED
MAPREDUCE-4983. Fixed various platform specific assumptions in various tests, MAPREDUCE-4983. Fixed various platform specific assumptions in various tests,
so that they can pass on Windows too. (Chris Nauroth via vinodkv) 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 INCOMPATIBLE CHANGES