HDFS-7383. Merged to branch-2.6 also.

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

@@ -407,9 +407,6 @@ Release 2.7.0 - UNRELEASED
     HDFS-7366. BlockInfo should take replication as an short in the constructor.
     (Li Lu via wheat9)
 
-    HDFS-7383. DataNode.requestShortCircuitFdsForRead may throw 
-    NullPointerException. (szetszwo via suresh)
-
 Release 2.6.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -1418,6 +1415,9 @@ Release 2.6.0 - UNRELEASED
     HDFS-7382. DataNode in secure mode may throw NullPointerException if client
     connects before DataNode registers itself with NameNode. (cnauroth)
 
+    HDFS-7383. DataNode.requestShortCircuitFdsForRead may throw 
+    NullPointerException. (szetszwo via suresh)
+
 Release 2.5.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES