HDFS-7387. Merging to branch-2.6 for hadoop-2.6.0-rc1.

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

@@ -413,9 +413,6 @@ Release 2.7.0 - UNRELEASED
     HDFS-7366. BlockInfo should take replication as an short in the constructor.
     (Li Lu via wheat9)
 
-    HDFS-7387. NFS may only do partial commit due to a race between COMMIT and write
-    (brandonli)
-
     HDFS-7389. Named user ACL cannot stop the user from accessing the FS entity.
     (Vinayakumar B via cnauroth)
 
@@ -1430,6 +1427,9 @@ Release 2.6.0 - 2014-11-15
     HDFS-7383. DataNode.requestShortCircuitFdsForRead may throw 
     NullPointerException. (szetszwo via suresh)
 
+    HDFS-7387. NFS may only do partial commit due to a race between COMMIT and write
+    (brandonli)
+
 Release 2.5.2 - 2014-11-10
 
   INCOMPATIBLE CHANGES