From 87a02553ee312f95035c28eb25db851224c147e1 Mon Sep 17 00:00:00 2001
From: Arun Murthy <acmurthy@apache.org>
Date: Fri, 19 Jul 2013 01:03:19 +0000
Subject: [PATCH] Fixed CHANGES.txt to reflect that all fixes in 2.1.1-beta are
 now in 2.1.0-beta.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1504738 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 12 +++---
 hadoop-yarn-project/CHANGES.txt             | 48 ++++++++++-----------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 5598a8f8da1..a8ea289e33c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -266,16 +266,10 @@ Release 2.1.1-beta - UNRELEASED
 
   IMPROVEMENTS
 
-    HADOOP-9418.  Add symlink support to DistributedFileSystem (Andrew Wang via
-    Colin Patrick McCabe)
-
   OPTIMIZATIONS
 
   BUG FIXES
 
-    HDFS-4982. JournalNode should relogin from keytab before fetching logs
-    from other JNs (todd)
-
 Release 2.1.0-beta - 2013-07-02
 
   INCOMPATIBLE CHANGES
@@ -452,6 +446,9 @@ Release 2.1.0-beta - 2013-07-02
     HDFS-4996. ClientProtocol#metaSave can be made idempotent by overwriting the
     output file instead of appending to it. (cnauroth)
 
+    HADOOP-9418.  Add symlink support to DistributedFileSystem (Andrew Wang via
+    Colin Patrick McCabe)
+
   OPTIMIZATIONS
 
     HDFS-4465. Optimize datanode ReplicasMap and ReplicaInfo. (atm)
@@ -1218,6 +1215,9 @@ Release 2.1.0-beta - 2013-07-02
     HDFS-5005. Move SnapshotException and SnapshotAccessControlException 
     to o.a.h.hdfs.protocol. (jing9)
 
+    HDFS-4982. JournalNode should relogin from keytab before fetching logs
+    from other JNs (todd)
+
 Release 2.0.5-alpha - 06/06/2013
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index f7bfbf28207..27d708907a9 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -49,34 +49,10 @@ Release 2.1.1-beta - UNRELEASED
 
   IMPROVEMENTS
 
-    YARN-912. Move client facing exceptions to yarn-api module. (Mayank Bansal
-    via vinodkv)
-
   OPTIMIZATIONS
 
   BUG FIXES
 
-    YARN-368. Fixed a typo in error message in Auxiliary services. (Albert Chu
-    via vinodkv)
-
-    YARN-295. Fixed a race condition in ResourceManager RMAppAttempt state
-    machine. (Mayank Bansal via vinodkv)
-
-    YARN-523. Modified a test-case to validate container diagnostics on
-    localization failures. (Jian He via vinodkv)
-
-    YARN-661. Fixed NM to cleanup users' local directories correctly when
-    starting up. (Omkar Vinit Joshi via vinodkv)
-
-    YARN-820. Fixed an invalid state transition in NodeManager caused by failing
-    resource localization. (Mayank Bansal via vinodkv)
-
-    YARN-62. Modified NodeManagers to avoid AMs from abusing container tokens for
-    repetitive container launches. (Omkar Vinit Joshi via vinodkv)
-
-    YARN-814. Improving diagnostics when containers fail during launch due to
-    various reasons like invalid env etc. (Jian He via vinodkv)
-
 Release 2.1.0-beta - 2013-07-02
 
   INCOMPATIBLE CHANGES
@@ -515,6 +491,9 @@ Release 2.1.0-beta - 2013-07-02
     YARN-865. RM webservices can't query based on application Types. (Xuan Gong
     via hitesh)
 
+    YARN-912. Move client facing exceptions to yarn-api module. (Mayank Bansal
+    via vinodkv)
+
   OPTIMIZATIONS
 
     YARN-512. Log aggregation root directory check is more expensive than it
@@ -805,6 +784,27 @@ Release 2.1.0-beta - 2013-07-02
     YARN-333. Schedulers cannot control the queue-name of an 
     application. (sandyr via tucu)
 
+    YARN-368. Fixed a typo in error message in Auxiliary services. (Albert Chu
+    via vinodkv)
+
+    YARN-295. Fixed a race condition in ResourceManager RMAppAttempt state
+    machine. (Mayank Bansal via vinodkv)
+
+    YARN-523. Modified a test-case to validate container diagnostics on
+    localization failures. (Jian He via vinodkv)
+
+    YARN-661. Fixed NM to cleanup users' local directories correctly when
+    starting up. (Omkar Vinit Joshi via vinodkv)
+
+    YARN-820. Fixed an invalid state transition in NodeManager caused by failing
+    resource localization. (Mayank Bansal via vinodkv)
+
+    YARN-62. Modified NodeManagers to avoid AMs from abusing container tokens for
+    repetitive container launches. (Omkar Vinit Joshi via vinodkv)
+
+    YARN-814. Improving diagnostics when containers fail during launch due to
+    various reasons like invalid env etc. (Jian He via vinodkv)
+
 Release 2.0.5-alpha - 06/06/2013
 
   INCOMPATIBLE CHANGES