From a93a37a8cd99368ea9f52778492eb4d1ad593c27 Mon Sep 17 00:00:00 2001 From: Charles Lamb Date: Fri, 6 Jun 2014 01:49:53 +0000 Subject: [PATCH] Various fixes to CHANGES-fs-encryption.txt. Various Jiras ended up in the hadoop-common CHANGES-fs-encryption.txt by accident. Moved them to HDFS CHANGES-fs-encryption.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1600804 13f79535-47bb-0310-9956-ffa450edef68 --- .../hadoop-common/CHANGES-fs-encryption.txt | 5 ----- hadoop-hdfs-project/hadoop-hdfs/CHANGES-fs-encryption.txt | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES-fs-encryption.txt b/hadoop-common-project/hadoop-common/CHANGES-fs-encryption.txt index e19a4abf7a..4b8e982cfb 100644 --- a/hadoop-common-project/hadoop-common/CHANGES-fs-encryption.txt +++ b/hadoop-common-project/hadoop-common/CHANGES-fs-encryption.txt @@ -6,13 +6,8 @@ fs-encryption (Unreleased) NEW FEATURES - HDFS-6388. HDFS integration with KeyProvider. (clamb) - IMPROVEMENTS - HADOOP-6392. Wire crypto streams for encrypted files in - DFSClient. (clamb and yliu) - HADOOP-10603. Crypto input and output streams implementing Hadoop stream interfaces. (Yi Liu and Charles Lamb) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES-fs-encryption.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES-fs-encryption.txt index b7abd062f4..ad971b4267 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES-fs-encryption.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES-fs-encryption.txt @@ -6,10 +6,15 @@ fs-encryption (Unreleased) NEW FEATURES + HDFS-6388. HDFS integration with KeyProvider. (clamb) + IMPROVEMENTS HDFS-6473. Protocol and API for Encryption Zones (clamb) + HDFS-6392. Wire crypto streams for encrypted files in + DFSClient. (clamb and yliu) + HDFS-6476. Print out the KeyProvider after finding KP successfully on startup. (Juan Yu via wang)