From 371ef4cefc65996e41f7072c4f396fe14d2375b1 Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Mon, 29 Sep 2014 11:06:44 -0700 Subject: [PATCH] Move HDFS-4165 from trunk to 2.6.0 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 e59ccd5bf6..78af546245 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -204,9 +204,6 @@ Trunk (Unreleased) HDFS-4115. TestHDFSCLI.testAll fails one test due to number format. (Trevor Robinson via suresh) - HDFS-4165. Faulty sanity check in FsDirectory.unprotectedSetQuota. - (Binglin Chang via suresh) - HDFS-4105. The SPNEGO user for secondary namenode should use the web keytab. (Arpit Gupta via jitendra) @@ -518,6 +515,9 @@ Release 2.6.0 - UNRELEASED HDFS-6519. Document oiv_legacy command (Akira AJISAKA via aw) + HDFS-4165. Faulty sanity check in FsDirectory.unprotectedSetQuota. + (Binglin Chang via suresh) + OPTIMIZATIONS HDFS-6690. Deduplicate xattr names in memory. (wang)