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 ar...@apache.org on 2014/09/09 22:32:39 UTC

git commit: HDFS-6482. Fix CHANGES.txt in trunk

Repository: hadoop
Updated Branches:
  refs/heads/HDFS-6581 61ccd5036 -> be30c86cc


HDFS-6482. Fix CHANGES.txt in trunk


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

Branch: refs/heads/HDFS-6581
Commit: be30c86cc9f71894dc649ed22983e5c42e9b6951
Parents: 61ccd50
Author: arp <ar...@apache.org>
Authored: Tue Sep 9 13:32:08 2014 -0700
Committer: arp <ar...@apache.org>
Committed: Tue Sep 9 13:32:08 2014 -0700

----------------------------------------------------------------------
 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/be30c86c/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 2686306..41f87db 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -130,9 +130,6 @@ Trunk (Unreleased)
     HDFS-6609. Use DirectorySnapshottableFeature to represent a snapshottable
     directory. (Jing Zhao via wheat9)
 
-    HDFS-6482. Use block ID-based block layout on datanodes (James Thomas via
-    Colin Patrick McCabe)
-
   OPTIMIZATIONS
 
   BUG FIXES
@@ -457,6 +454,9 @@ Release 2.6.0 - UNRELEASED
     HDFS-6036. Forcibly timeout misbehaving DFSClients that try to do
     no-checksum reads that extend too long (cmccabe)
 
+    HDFS-6482. Use block ID-based block layout on datanodes (James Thomas via
+    Colin Patrick McCabe)
+
   OPTIMIZATIONS
 
     HDFS-6690. Deduplicate xattr names in memory. (wang)