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 ki...@apache.org on 2015/04/09 17:06:16 UTC

hadoop git commit: Fix CHANGES.txt for branch-2

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 53e0bf5c1 -> 6d1cb3422


Fix CHANGES.txt for branch-2


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

Branch: refs/heads/branch-2
Commit: 6d1cb34221cecf640fab5dcb8bbfe1cd899edec6
Parents: 53e0bf5
Author: Kihwal Lee <ki...@apache.org>
Authored: Thu Apr 9 10:05:43 2015 -0500
Committer: Kihwal Lee <ki...@apache.org>
Committed: Thu Apr 9 10:05:43 2015 -0500

----------------------------------------------------------------------
 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/6d1cb342/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 53b88dd..2c4a3bf 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -84,9 +84,6 @@ Release 2.8.0 - UNRELEASED
     HDFS-8076. Code cleanup for DFSInputStream: use offset instead of
     LocatedBlock when possible. (Zhe Zhang via wang)
 
-    HDFS-8025. Addendum fix for HDFS-3087 Decomissioning on NN restart can
-    complete without blocks being replicated. (Ming Ma via wang)
-
     HDFS-8089. Move o.a.h.hdfs.web.resources.* to the client jars. (wheat9)
 
     HDFS-7979. Initialize block report IDs with a random number. (wang)
@@ -1120,6 +1117,9 @@ Release 2.7.0 - UNRELEASED
     HDFS-8072. Reserved RBW space is not released if client terminates while
     writing block. (Arpit Agarwal)
 
+    HDFS-8025. Addendum fix for HDFS-3087 Decomissioning on NN restart can
+    complete without blocks being replicated. (Ming Ma via wang)
+
     BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS
 
       HDFS-7720. Quota by Storage Type API, tools and ClientNameNode