MAPREDUCE-5827. Merging change r1589238 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589241 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -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