You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ac...@apache.org on 2014/11/10 03:22:11 UTC
hadoop git commit: HDFS-7383. Merged to branch-2.6 also.
Repository: hadoop
Updated Branches:
refs/heads/trunk 14b87b70a -> f62ec3173
HDFS-7383. Merged to branch-2.6 also.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f62ec317
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f62ec317
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f62ec317
Branch: refs/heads/trunk
Commit: f62ec31739cc15097107655c6c8265b5d3625817
Parents: 14b87b7
Author: Arun C. Murthy <ac...@apache.org>
Authored: Sun Nov 9 18:22:05 2014 -0800
Committer: Arun C. Murthy <ac...@apache.org>
Committed: Sun Nov 9 18:22:05 2014 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f62ec317/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index af18379..6904686 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