From bf38793ce169137bb3ef36e96db7ea62d89ce1c4 Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Wed, 17 Sep 2014 18:08:34 -0700 Subject: [PATCH] Move some HDFS JIRAs to the correct CHANGES.txt --- hadoop-common-project/hadoop-common/CHANGES.txt | 8 -------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index f2b4180a9f1..0ca2953fcc1 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -530,8 +530,6 @@ Release 2.6.0 - UNRELEASED HADOOP-10922. User documentation for CredentialShell. (Larry McCay via wang) - HDFS-6843. Create FileStatus isEncrypted() method (clamb via cmccabe) - HADOOP-11016. KMS should support signing cookies with zookeeper secret manager. (tucu) @@ -726,12 +724,6 @@ Release 2.6.0 - UNRELEASED HADOOP-11056. OsSecureRandom.setConf() might leak file descriptors (yzhang via cmccabe) - HDFS-6912. SharedFileDescriptorFactory should not allocate sparse files - (cmccabe) - - HDFS-7075. hadoop-fuse-dfs fails because it cannot find - JavaKeyStoreProvider$Factory (cmccabe) - HADOOP-11040. Return value of read(ByteBuffer buf) in CryptoInputStream is incorrect in some cases. (Yi Liu via wang) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 567a6abb771..0e01ca0a3a9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -471,6 +471,8 @@ Release 2.6.0 - UNRELEASED HDFS-6705. Create an XAttr that disallows the HDFS admin from accessing a file. (clamb via wang) + HDFS-6843. Create FileStatus isEncrypted() method (clamb via cmccabe) + OPTIMIZATIONS HDFS-6690. Deduplicate xattr names in memory. (wang) @@ -670,6 +672,12 @@ Release 2.6.0 - UNRELEASED and TestDFSClientFailover.testDoesntDnsResolveLogicalURI failing on jdk7. (Akira Ajisaka via wang) + HDFS-6912. SharedFileDescriptorFactory should not allocate sparse files + (cmccabe) + + HDFS-7075. hadoop-fuse-dfs fails because it cannot find + JavaKeyStoreProvider$Factory (cmccabe) + BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS HDFS-6387. HDFS CLI admin tool for creating & deleting an