Move HDFS-6987 from trunk to branch-2 in CHANGES.txt

This commit is contained in:
Andrew Wang 2014-09-24 12:11:58 -07:00
parent d78b452a4f
commit 9fa5a89be3

View File

@ -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)