Move HDFS-4581, HDFS-4699, HDFS-4261 and HDFS-4880 to release 1.2.1 section

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

CHANGES.txt

@@ -14,9 +14,6 @@ Release 1.3.0 - unreleased
     HADOOP-9573. Fix test-patch script to work with the enhanced
     PreCommit-Admin script.(Giridharan Kesavan)
 
-    HDFS-4880. Print the image and edits file loaded by the namenode in the
-    logs. (Arpit Agarwal via suresh)
-
   BUG FIXES
 
     MAPREDUCE-5047. keep.failed.task.files=true causes job failure on 
@@ -37,18 +34,12 @@ Release 1.3.0 - unreleased
     HDFS-4622. Remove redundant synchronized from 
     FSNamesystem#rollEditLog in branch-1. (Jing Zhao via suresh)
 
-    HDFS-4581. DataNode.checkDiskError should not be called on network errors.
-    (Rohit Kochar via kihwal)
-
     MAPREDUCE-2817. MiniRMCluster hardcodes 'mapred.local.dir' configuration 
     to 'build/test/mapred/local'. (rkanter via tucu)
 
     MAPREDUCE-5133. TestSubmitJob.testSecureJobExecution is flaky due to job 
     dir deletion race. (sandyr via tucu)
 
-    HDFS-4699. Additional conditions for avoiding unnecessary 
-    DataNode.checkDiskError calls. (Chris Nauroth via kihwal)
-
     MAPREDUCE-5218. Annotate (comment) internal classes as Private. 
     (kkambatl via tucu)
 
@@ -61,9 +52,6 @@ Release 1.3.0 - unreleased
     HADOOP-8981. TestMetricsSystemImpl fails on Windows. (Xuan Gong, backported
     by Chris Nauroth via suresh)
 
-    HDFS-4261. Fix bugs in Balaner causing infinite loop and
-    TestBalancerWithNodeGroup timeing out.  (Junping Du via szetszwo)
-
     MAPREDUCE-5250. Searching for ';' in JobTracker History throws 
     ArrayOutOfBoundException. (kkambatl via tucu)
 
@@ -75,6 +63,9 @@ Release 1.2.1 - Unreleased
 
   IMPROVEMENTS
 
+    HDFS-4880. Print the image and edits file loaded by the namenode in the
+    logs. (Arpit Agarwal via suresh)
+
   BUG FIXES
 
     MAPREDUCE-5206. Ensure that a job doesn't get added to RetiredJobs
@@ -87,6 +78,15 @@ Release 1.2.1 - Unreleased
     MAPREDUCE-3859. Fix CapacityScheduler to correctly compute runtime queue
     limits for high-ram jobs. (Sergey Tryuber via acmurthy)
 
+    HDFS-4581. DataNode.checkDiskError should not be called on network errors.
+    (Rohit Kochar via kihwal)
+
+    HDFS-4699. Additional conditions for avoiding unnecessary 
+    DataNode.checkDiskError calls. (Chris Nauroth via kihwal)
+
+    HDFS-4261. Fix bugs in Balaner causing infinite loop and
+    TestBalancerWithNodeGroup timing out.  (Junping Du via szetszwo)
+
 Release 1.2.0 - 2013.05.05
 
   INCOMPATIBLE CHANGES