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:25:12 UTC

hadoop git commit: Revert "HDFS-7383. Merged to branch-2.6 also."

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 755af2768 -> 1fc98b5c9


Revert "HDFS-7383. Merged to branch-2.6 also."

This reverts commit 755af2768b2be1ded532e795db30ec0bfea03e66.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1fc98b5c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1fc98b5c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1fc98b5c

Branch: refs/heads/branch-2
Commit: 1fc98b5c9a2311900d89952fdf0ce5816902cf59
Parents: 755af27
Author: Arun C. Murthy <ac...@apache.org>
Authored: Sun Nov 9 18:25:05 2014 -0800
Committer: Arun C. Murthy <ac...@apache.org>
Committed: Sun Nov 9 18:25:05 2014 -0800

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/1fc98b5c/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 5974fa6..e7f288b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1273,9 +1273,6 @@ 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