Fixed CHANGES.txt to reflect that new content in branch-2 goes to hadoop-2.3.0.

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

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

@@ -16,20 +16,6 @@ Release 2.3.0 - UNRELEASED
 
     HADOOP-9241. DU refresh interval is not configurable (harsh)
 
-  OPTIMIZATIONS
-
-  BUG FIXES
-
-    HADOOP-9582. Non-existent file to "hadoop fs -conf" doesn't throw error
-    (Ashwin Shankar via jlowe)
-
-Release 2.2.0 - UNRELEASED
-
-  INCOMPATIBLE CHANGES
-
-  NEW FEATURES
-
-  IMPROVEMENTS
     HADOOP-9417.  Support for symlink resolution in LocalFileSystem /
     RawLocalFileSystem.  (Andrew Wang via Colin Patrick McCabe)
 
@@ -43,6 +29,9 @@ Release 2.2.0 - UNRELEASED
 
   BUG FIXES
 
+    HADOOP-9582. Non-existent file to "hadoop fs -conf" doesn't throw error
+    (Ashwin Shankar via jlowe)
+
 Release 2.1.1-beta - UNRELEASED
 
   INCOMPATIBLE CHANGES

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

@@ -12,13 +12,14 @@ Release 2.3.0 - UNRELEASED
 
   BUG FIXES
 
-Release 2.2.0 - UNRELEASED
+Release 2.3.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
 
   NEW FEATURES
 
   IMPROVEMENTS
+
     HDFS-4657.  Limit the number of blocks logged by the NN after a block
     report to a configurable value.  (Aaron T. Myers via Colin Patrick
     McCabe)

hadoop-mapreduce-project/CHANGES.txt

@@ -27,18 +27,6 @@ Release 2.3.0 - UNRELEASED
     MAPREDUCE-5380. Invalid mapred command should return non-zero exit code
     (Stephen Chu via jlowe)
 
-Release 2.2.0 - UNRELEASED
-
-  INCOMPATIBLE CHANGES
-
-  NEW FEATURES
-
-  IMPROVEMENTS
-
-  OPTIMIZATIONS
-
-  BUG FIXES
-
 Release 2.1.1-beta - UNRELEASED
 
   INCOMPATIBLE CHANGES

hadoop-yarn-project/CHANGES.txt

@@ -12,18 +12,6 @@ Release 2.3.0 - UNRELEASED
 
   BUG FIXES
 
-Release 2.2.0 - UNRELEASED
-
-  INCOMPATIBLE CHANGES
-
-  NEW FEATURES
-
-  IMPROVEMENTS
-
-  OPTIMIZATIONS
-
-  BUG FIXES
-
 Release 2.1.1-beta - UNRELEASED
 
   INCOMPATIBLE CHANGES