svn merge -c 1509475 FIXES: Correct fix versions for MAPREDUCE-5428 and YARN-573.

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

hadoop-mapreduce-project/CHANGES.txt

@@ -66,6 +66,9 @@ Release 2.1.1-beta - UNRELEASED
     MAPREDUCE-5385. Fixed a bug with JobContext getCacheFiles API. (Omkar Vinit
     Joshi via vinodkv)
 
+    MAPREDUCE-5428.  HistoryFileManager doesn't stop threads when service is
+    stopped (Karthik Kambatla via jlowe)
+
 Release 2.1.0-beta - 2013-08-06
 
   INCOMPATIBLE CHANGES
@@ -499,9 +502,6 @@ Release 2.1.0-beta - 2013-08-06
     MAPREDUCE-5419. TestSlive is getting FileNotFound Exception (Robert Parker
     via jlowe)
 
-    MAPREDUCE-5428.  HistoryFileManager doesn't stop threads when service is
-    stopped (Karthik Kambatla via jlowe)
-
   BREAKDOWN OF HADOOP-8562 SUBTASKS
 
     MAPREDUCE-4739. Some MapReduce tests fail to find winutils.

hadoop-yarn-project/CHANGES.txt

@@ -36,6 +36,9 @@ Release 2.1.1-beta - UNRELEASED
     YARN-502. Fixed a state machine issue with RMNode inside ResourceManager
     which was crashing scheduler. (Mayank Bansal via vinodkv)
 
+    YARN-573. Shared data structures in Public Localizer and Private Localizer
+    are not Thread safe. (Omkar Vinit Joshi via jlowe)
+
 Release 2.1.0-beta - 2013-08-06
 
   INCOMPATIBLE CHANGES
@@ -768,9 +771,6 @@ Release 2.1.0-beta - 2013-08-06
     YARN-945. Removed setting of AMRMToken's service from ResourceManager
     and changed client libraries do it all the time and correctly. (vinodkv)
 
-    YARN-573. Shared data structures in Public Localizer and Private Localizer
-    are not Thread safe. (Omkar Vinit Joshi via jlowe)
-
   BREAKDOWN OF HADOOP-8562/YARN-191 SUBTASKS AND RELATED JIRAS
 
     YARN-158. Yarn creating package-info.java must not depend on sh.