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 wa...@apache.org on 2014/09/24 21:12:06 UTC
git commit: Move HDFS-6987 from trunk to branch-2 in CHANGES.txt
Repository: hadoop
Updated Branches:
refs/heads/trunk d78b452a4 -> 9fa5a89be
Move HDFS-6987 from trunk to branch-2 in CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9fa5a89b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9fa5a89b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9fa5a89b
Branch: refs/heads/trunk
Commit: 9fa5a89be3ca0bba156999c07a375cf95877b8d1
Parents: d78b452
Author: Andrew Wang <wa...@apache.org>
Authored: Wed Sep 24 12:11:58 2014 -0700
Committer: Andrew Wang <wa...@apache.org>
Committed: Wed Sep 24 12:11:58 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/9fa5a89b/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 43cebc0..d97203f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -133,9 +133,6 @@ Trunk (Unreleased)
HDFS-6609. Use DirectorySnapshottableFeature to represent a snapshottable
directory. (Jing Zhao via wheat9)
- HDFS-6987. Move CipherSuite xattr information up to the encryption zone
- root. (Zhe Zhang via wang)
-
OPTIMIZATIONS
BUG FIXES
@@ -575,6 +572,9 @@ Release 2.6.0 - UNRELEASED
HDFS-6948. DN rejects blocks if it has older UC block
(Eric Payne via kihwal)
+ HDFS-6987. Move CipherSuite xattr information up to the encryption zone
+ root. (Zhe Zhang via wang)
+
OPTIMIZATIONS
HDFS-6690. Deduplicate xattr names in memory. (wang)