From f62ec31739cc15097107655c6c8265b5d3625817 Mon Sep 17 00:00:00 2001 From: "Arun C. Murthy" Date: Sun, 9 Nov 2014 18:22:05 -0800 Subject: [PATCH] HDFS-7383. Merged to branch-2.6 also. --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index af183793124..690468642e6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/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