Author: jlowe
Date: Wed Nov 13 16:19:21 2013
New Revision: 1541583
URL: http://svn.apache.org/r1541583
Log:
svn merge -c 1541566 FIXES: MAPREDUCE-5610. TestSleepJob fails in jdk7.
Contributed by Jonathan Eagles
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=1541583&r1=1541582&r2=1541583&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Wed
Nov 13 16:19:21 2013
@@ -70,6 +70,8 @@ Release 2.3.0 - UNRELEASED
created by CombineFileInputFormat to fail (Robert Parker and Jason Lowe
via jlowe)
+ MAPREDUCE-5610. TestSleepJob fails in jdk7 (Jonathan Eagles via jlowe)
+
Release 2.2.1 - UNRELEASED
INCOMPATIBLE CHANGES
