updating CHANGES.txt after committing MAPREDUCE-5333,HADOOP-9661,HADOOP-9355,HADOOP-9673,HADOOP-9414,HADOOP-9416,HDFS-4797,YARN-866,YARN-736,YARN-883 to 2.1-beta branch

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1502075 13f79535-47bb-0310-9956-ffa450edef68

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -298,23 +298,6 @@ Release 2.2.0 - UNRELEASED
 
   IMPROVEMENTS
 
-    HADOOP-9661. Allow metrics sources to be extended. (sandyr via tucu)
-
-    HADOOP-9370.  Write FSWrapper class to wrap FileSystem and FileContext for
-    better test coverage.  (Andrew Wang via Colin Patrick McCabe)
-
-    HADOOP-9355.  Abstract symlink tests to use either FileContext or
-    FileSystem.  (Andrew Wang via Colin Patrick McCabe)
-
-    HADOOP-9673.  NetworkTopology: when a node can't be added, print out its
-    location for diagnostic purposes.  (Colin Patrick McCabe)
-
-    HADOOP-9414.  Refactor out FSLinkResolver and relevant helper methods.
-    (Andrew Wang via Colin Patrick McCabe)
-
-    HADOOP-9416.  Add new symlink resolution methods in FileSystem and
-    FileSystemLinkResolver.  (Andrew Wang via Colin Patrick McCabe)
-
   OPTIMIZATIONS
 
   BUG FIXES
@@ -454,6 +437,23 @@ Release 2.1.0-beta - 2013-07-02
     HADOOP-9691. RPC clients can generate call ID using AtomicInteger instead of
     synchronizing on the Client instance. (cnauroth)
 
+    HADOOP-9661. Allow metrics sources to be extended. (sandyr via tucu)
+
+    HADOOP-9370.  Write FSWrapper class to wrap FileSystem and FileContext for
+    better test coverage.  (Andrew Wang via Colin Patrick McCabe)
+
+    HADOOP-9355.  Abstract symlink tests to use either FileContext or
+    FileSystem.  (Andrew Wang via Colin Patrick McCabe)
+
+    HADOOP-9673.  NetworkTopology: when a node can't be added, print out its
+    location for diagnostic purposes.  (Colin Patrick McCabe)
+
+    HADOOP-9414.  Refactor out FSLinkResolver and relevant helper methods.
+    (Andrew Wang via Colin Patrick McCabe)
+
+    HADOOP-9416.  Add new symlink resolution methods in FileSystem and
+    FileSystemLinkResolver.  (Andrew Wang via Colin Patrick McCabe)
+
   OPTIMIZATIONS
 
     HADOOP-9150. Avoid unnecessary DNS resolution attempts for logical URIs

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -255,9 +255,6 @@ Release 2.2.0 - UNRELEASED
 
   BUG FIXES
 
-    HDFS-4797. BlockScanInfo does not override equals(..) and hashCode()
-    consistently.  (szetszwo)
-
 Release 2.1.1-beta - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -1181,6 +1178,9 @@ Release 2.1.0-beta - 2013-07-02
     HDFS-4969. WebhdfsFileSystem expects non-standard WEBHDFS Json element. 
     (rkanter via tucu)
 
+    HDFS-4797. BlockScanInfo does not override equals(..) and hashCode()
+    consistently.  (szetszwo)
+
 Release 2.0.5-alpha - 06/06/2013
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce-project/CHANGES.txt

@@ -166,9 +166,6 @@ Release 2.2.0 - UNRELEASED
 
   IMPROVEMENTS
 
-    MAPREDUCE-5333. Add test that verifies MRAM works correctly when sending 
-    requests with non-normalized capabilities. (ywskycn via tucu)
-
   OPTIMIZATIONS
 
   BUG FIXES
@@ -344,6 +341,9 @@ Release 2.1.0-beta - 2013-07-02
     MAPREDUCE-5326. Added version to shuffle header. (Zhijie Shen via
     acmurthy)
 
+    MAPREDUCE-5333. Add test that verifies MRAM works correctly when sending
+    requests with non-normalized capabilities. (ywskycn via tucu)
+
   OPTIMIZATIONS
 
     MAPREDUCE-4974. Optimising the LineRecordReader initialize() method 

hadoop-yarn-project/CHANGES.txt

@@ -37,13 +37,6 @@ Release 2.2.0 - UNRELEASED
 
   IMPROVEMENTS
 
-    YARN-866. Add test for class ResourceWeights. (ywskycn via tucu)
-
-    YARN-736. Add a multi-resource fair sharing metric. (sandyr via tucu)
-
-    YARN-883. Expose Fair Scheduler-specific queue metrics. (sandyr via tucu)
-
-
   OPTIMIZATIONS
 
   BUG FIXES
@@ -474,6 +467,12 @@ Release 2.1.0-beta - 2013-07-02
     YARN-827. Need to make Resource arithmetic methods accessible (Jian He via
     bikas)
 
+    YARN-866. Add test for class ResourceWeights. (ywskycn via tucu)
+
+    YARN-736. Add a multi-resource fair sharing metric. (sandyr via tucu)
+
+    YARN-883. Expose Fair Scheduler-specific queue metrics. (sandyr via tucu)
+
   OPTIMIZATIONS
 
     YARN-512. Log aggregation root directory check is more expensive than it