MAPREDUCE-5827. Merging change r1589241 from branch-2 to branch-2.4.

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

hadoop-mapreduce-project/CHANGES.txt

@@ -1,8 +1,5 @@
 Hadoop MapReduce Change Log
 
-    MAPREDUCE-5827. TestSpeculativeExecutionWithMRApp fails.
-    (Zhijie Shen via cnauroth)
-
 Release 2.4.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -30,6 +27,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