From 9fa5a89be3ca0bba156999c07a375cf95877b8d1 Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Wed, 24 Sep 2014 12:11:58 -0700 Subject: [PATCH] Move HDFS-6987 from trunk to branch-2 in CHANGES.txt --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 43cebc008c..d97203f6ee 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)