Add branch-2 only commit HDFS-7138 to CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/116f8315 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/116f8315 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/116f8315 Branch: refs/heads/HDFS-6581 Commit: 116f83157aae90eb95b5f6ee4f70133d9e821a11 Parents: 63198bf Author: Andrew Wang <w...@apache.org> Authored: Wed Sep 24 16:47:09 2014 -0700 Committer: Andrew Wang <w...@apache.org> Committed: Wed Sep 24 16:47:09 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/116f8315/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 25f4ddc..f87e5c6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -577,6 +577,8 @@ Release 2.6.0 - UNRELEASED HDFS-7139. Unit test for creating encryption zone on root path. (Zhe Zhang via wang) + HDFS-7138. Fix hftp to work with encryption. (clamb via wang) + OPTIMIZATIONS HDFS-6690. Deduplicate xattr names in memory. (wang)
