Fixes to MR CHANGES.txt to bring jiras under the correct release. At least 2.0.4 onwards in sync with trunk.

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

hadoop-mapreduce-project/CHANGES.txt

@@ -8,6 +8,9 @@ Release 2.0.5-beta - UNRELEASED
 
   IMPROVEMENTS
 
+    MAPREDUCE-3008. Improvements to cumulative CPU emulation for short running
+    tasks in Gridmix. (amarrk via tgraves)
+
     MAPREDUCE-5033. mapred shell script should respect usage flags
     (--help -help -h). (Andrew Wang via atm)
 
@@ -20,6 +23,9 @@ Release 2.0.5-beta - UNRELEASED
     MAPREDUCE-4875. coverage fixing for org.apache.hadoop.mapred 
     (Aleksey Gorshkov via bobby)
 
+    MAPREDUCE-5129. Allow tags to JobHistory for deeper analytics. (billie via
+    acmurthy)
+
     MAPREDUCE-3787. [Gridmix] Optimize job monitoring and STRESS mode for
     faster job submission. (amarrk via tgraves)
 
@@ -94,9 +100,6 @@ Release 2.0.5-beta - UNRELEASED
     MAPREDUCE-5077. Remove mapreduce.util.ResourceCalculatorPlugin and related
     code. (Karthik Kambatla via sseth)
 
-    MAPREDUCE-3008. Improvements to cumulative CPU emulation for short running
-    tasks in Gridmix. (amarrk via tgraves)
-
     MAPREDUCE-4083. [Gridmix] NPE in cpu emulation. (amarrk via tgraves)
 
     MAPREDUCE-4100. [Gridmix] Bug fixed in compression emulation feature for 
@@ -111,8 +114,8 @@ Release 2.0.5-beta - UNRELEASED
     MAPREDUCE-3757. [Rumen] Fixed Rumen Folder to adjust shuffleFinished and
     sortFinished times when needed. (Ravi Gummadi via tgraves)
 
-    MAPREDUCE-5006. Fix failing streaming tests due to MAPREDUCE-4994.
-    (Sandy Ryza via tomwhite)
+    MAPREDUCE-5138. Fix LocalDistributedCacheManager after YARN-112. (Omkar Vinit
+    Joshi via vinodkv)
 
     MAPREDUCE-5086. MR app master deletes staging dir when sent a reboot
     command from the RM. (Jian He via jlowe)
@@ -125,13 +128,13 @@ Release 2.0.4-alpha - UNRELEASED
 
   IMPROVEMENTS
 
-    MAPREDUCE-5129. Allow tags to JobHistory for deeper analytics. (billie via
-    acmurthy)
-
   OPTIMIZATIONS
 
   BUG FIXES
 
+    MAPREDUCE-5006. Fix failing streaming tests due to MAPREDUCE-4994.
+    (Sandy Ryza via tomwhite)
+
     MAPREDUCE-5088. MR Client gets an renewer token exception while Oozie is
     submitting a job (Daryn Sharp via cos)
 
@@ -142,9 +145,6 @@ Release 2.0.4-alpha - UNRELEASED
     MAPREDUCE-5083. MiniMRCluster should use a random component when creating an
     actual cluster (Siddharth Seth via hitesh)
 
-    MAPREDUCE-5138. Fix LocalDistributedCacheManager after YARN-112. (Omkar Vinit
-    Joshi via vinodkv)
-
 Release 2.0.3-alpha - 2013-02-06 
 
   INCOMPATIBLE CHANGES