Move some of the jiras merged into branch-2 to appropriate 2.x section in CHANGES.txt

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

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

@@ -7,20 +7,6 @@ Trunk (Unreleased)
     HADOOP-8124. Remove the deprecated FSDataOutputStream constructor,
     FSDataOutputStream.sync() and Syncable.sync().  (szetszwo)
 
-    HADOOP-8886. Remove KFS support. (eli)
-    
-    HADOOP-9163 The rpc msg in ProtobufRpcEngine.proto should be moved out to
-    avoid an extra copy (Sanjay Radia)
-
-    HADOOP-9151 Include RPC error info in RpcResponseHeader instead of sending
-    it separately (sanjay Radia)
-
-    HADOOP-9380 Add totalLength to rpc response  (sanjay Radia)
-
-    HADOOP-9194. RPC Support for QoS. (Junping Du via llu)
-
-    HADOOP-9425 Add error codes to rpc-response (sanjay Radia)
-
   NEW FEATURES
     
     HADOOP-8561. Introduce HADOOP_PROXY_USER for secure impersonation in child
@@ -564,6 +550,20 @@ Release 2.0.5-beta - UNRELEASED
 
   INCOMPATIBLE CHANGES
 
+    HADOOP-8886. Remove KFS support. (eli)
+
+    HADOOP-9163 The rpc msg in ProtobufRpcEngine.proto should be moved out to
+    avoid an extra copy (Sanjay Radia)
+
+    HADOOP-9151 Include RPC error info in RpcResponseHeader instead of sending
+    it separately (sanjay Radia)
+
+    HADOOP-9380 Add totalLength to rpc response  (sanjay Radia)
+
+    HADOOP-9425 Add error codes to rpc-response (sanjay Radia)
+
+    HADOOP-9194. RPC Support for QoS. (Junping Du via llu)
+
   NEW FEATURES
 
     HADOOP-9283. Add support for running the Hadoop client on AIX. (atm)