Move several JIRAs from trunk to branch-2 section of CHANGES.txt

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

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

@@ -9,9 +9,6 @@ Trunk (unreleased changes)
 
   NEW FEATURES
     
-    HADOOP-8135. Add ByteBufferReadable interface to FSDataInputStream. (Henry
-    Robinson via atm)
-
     HADOOP-8469. Make NetworkTopology class pluggable.  (Junping Du via
     szetszwo)
 
@@ -55,9 +52,6 @@ Trunk (unreleased changes)
     HADOOP-7994. Remove getProtocolVersion and getProtocolSignature from the 
     client side translator and server side implementation. (jitendra)
 
-    HADOOP-8244. Improve comments on ByteBufferReadable.read. (Henry Robinson
-    via atm)
-
     HADOOP-7757. Test file reference count is at least 3x actual value (Jon
     Eagles via bobby)
 
@@ -177,6 +171,9 @@ Branch-2 ( Unreleased changes )
     HDFS-3042. Automatic failover support for NameNode HA (todd)
     (see dedicated section below for breakdown of subtasks)
 
+    HADOOP-8135. Add ByteBufferReadable interface to FSDataInputStream. (Henry
+    Robinson via atm)
+
   IMPROVEMENTS
 
     HADOOP-8340. SNAPSHOT build versions should compare as less than their eventual
@@ -199,6 +196,9 @@ Branch-2 ( Unreleased changes )
 
     HADOOP-8450. Remove src/test/system. (eli)
 
+    HADOOP-8244. Improve comments on ByteBufferReadable.read. (Henry Robinson
+    via atm)
+
   BUG FIXES
 
     HADOOP-8372. NetUtils.normalizeHostName() incorrectly handles hostname

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

@@ -90,16 +90,8 @@ Trunk (unreleased changes)
     HDFS-3040. TestMulitipleNNDataBlockScanner is misspelled. (Madhukara Phatak
     via atm)
 
-    HDFS-3514. Add missing TestParallelLocalRead. (Henry Robinson via atm)
-
   OPTIMIZATIONS
 
-    HDFS-2834. Add a ByteBuffer-based read API to DFSInputStream.
-    (Henry Robinson via todd)
-
-    HDFS-3110. Use directRead API to reduce the number of buffer copies in
-    libhdfs (Henry Robinson via todd)
-
   BUG FIXES
 
     HDFS-2299. TestOfflineEditsViewer is failing on trunk. (Uma Maheswara Rao G
@@ -147,11 +139,6 @@ Trunk (unreleased changes)
     factor is reduced after sync follwed by closing that file. (Ashish Singhi 
     via umamahesh)
 
-    HDFS-3235. MiniDFSClusterManager doesn't correctly support -format option.
-    (Henry Robinson via atm)
-
-    HDFS-3243. TestParallelRead timing out on jenkins. (Henry Robinson via todd)
-
     HDFS-3265. PowerPc Build error. (Kumar Ravi via mattf)
 
     HDFS-2312. FSNamesystem javadoc incorrectly says its for DNs. (harsh)
@@ -232,6 +219,12 @@ Branch-2 ( Unreleased changes )
     HDFS-2982. Startup performance suffers when there are many edit log
     segments. (Colin Patrick McCabe via todd)
 
+    HDFS-2834. Add a ByteBuffer-based read API to DFSInputStream.
+    (Henry Robinson via todd)
+
+    HDFS-3110. Use directRead API to reduce the number of buffer copies in
+    libhdfs (Henry Robinson via todd)
+
   BUG FIXES
 
     HDFS-3385. The last block of INodeFileUnderConstruction is not
@@ -305,6 +298,13 @@ Branch-2 ( Unreleased changes )
     HDFS-2914. HA: Standby should not enter safemode when resources are low.
     (Vinay via atm)
 
+    HDFS-3235. MiniDFSClusterManager doesn't correctly support -format option.
+    (Henry Robinson via atm)
+
+    HDFS-3514. Add missing TestParallelLocalRead. (Henry Robinson via atm)
+
+    HDFS-3243. TestParallelRead timing out on jenkins. (Henry Robinson via todd)
+
   BREAKDOWN OF HDFS-3042 SUBTASKS
 
     HDFS-2185. HDFS portion of ZK-based FailoverController (todd)