HDFS-7213. processIncrementalBlockReport performance degradation. Contributed by Eric Payne.

Moved CHANGES.TXT entry to 2.6.1

(cherry picked from commit d25cb8fe12d00faf3e8f3bfd23fd1b01981a340f)
(cherry picked from commit 2c0063d4206efffd9cd659269d7e5dc502e44f33)

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

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

@@ -128,9 +128,6 @@ Release 2.7.1 - 2015-07-06
     HDFS-5215. dfs.datanode.du.reserved is not considered while computing
     available space ( Brahma Reddy Battula via Yongjun Zhang)
 
-    HDFS-8486. DN startup may cause severe data loss (Daryn Sharp via Colin P.
-    McCabe)
-
     HDFS-8270. create() always retried with hardcoded timeout when file already
     exists with open lease (J.Andreina via vinayakumarb)
 
@@ -273,9 +270,6 @@ Release 2.7.0 - 2015-04-20
     HDFS-5928. Show namespace and namenode ID on NN dfshealth page.
     (Siqi Li via wheat9)
 
-    HDFS-7213. processIncrementalBlockReport performance degradation.
-    (Eric Payne via kihwal)
-
     HDFS-7280. Use netty 4 in WebImageViewer. (wheat9)
 
     HDFS-3342. SocketTimeoutException in BlockSender.sendChunks could
@@ -1209,6 +1203,12 @@ Release 2.6.1 - UNRELEASED
     HDFS-7733. NFS: readdir/readdirplus return null directory
     attribute on failure. (Arpit Agarwal)
 
+    HDFS-8486. DN startup may cause severe data loss (Daryn Sharp via Colin P.
+    McCabe)
+
+    HDFS-7213. processIncrementalBlockReport performance degradation.
+    (Eric Payne via kihwal)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES