Author: cnauroth
Date: Tue Apr 22 18:25:02 2014
New Revision: 1589241
URL: http://svn.apache.org/r1589241
Log:
MAPREDUCE-5827. Merging change r1589238 from trunk to branch-2.
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=1589241&r1=1589240&r2=1589241&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue
Apr 22 18:25:02 2014
@@ -49,9 +49,6 @@ Release 2.5.0 - UNRELEASED
MAPREDUCE-5642. TestMiniMRChildTask fails on Windows.
(Chuan Liu via cnauroth)
- MAPREDUCE-5827. TestSpeculativeExecutionWithMRApp fails.
- (Zhijie Shen via cnauroth)
-
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES
@@ -79,6 +76,9 @@ Release 2.4.1 - UNRELEASED
MAPREDUCE-5828. Fixed a test issue with TestMapReduceJobControl that was
causing it to fail on Windows. (vinodkv)
+ MAPREDUCE-5827. TestSpeculativeExecutionWithMRApp fails.
+ (Zhijie Shen via cnauroth)
+
Release 2.4.0 - 2014-04-07
INCOMPATIBLE CHANGES
