Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 124AD17545 for ; Mon, 29 Sep 2014 21:02:15 +0000 (UTC) Received: (qmail 39842 invoked by uid 500); 29 Sep 2014 21:02:11 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 39576 invoked by uid 500); 29 Sep 2014 21:02:11 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 39155 invoked by uid 99); 29 Sep 2014 21:02:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Sep 2014 21:02:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 16AD2A02213; Mon, 29 Sep 2014 21:02:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: arp@apache.org To: common-commits@hadoop.apache.org Date: Mon, 29 Sep 2014 21:02:17 -0000 Message-Id: <7bb7d7f194654d44b6326988aed08dc7@git.apache.org> In-Reply-To: <0815810fbbe64059a00930ad2e242eb9@git.apache.org> References: <0815810fbbe64059a00930ad2e242eb9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/15] git commit: Move HDFS-4165 from trunk to 2.6.0 in CHANGES.txt. Move HDFS-4165 from trunk to 2.6.0 in CHANGES.txt. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/371ef4ce Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/371ef4ce Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/371ef4ce Branch: refs/heads/HDFS-6581 Commit: 371ef4cefc65996e41f7072c4f396fe14d2375b1 Parents: 84b9c63 Author: Andrew Wang Authored: Mon Sep 29 11:06:44 2014 -0700 Committer: Andrew Wang Committed: Mon Sep 29 11:06:44 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/371ef4ce/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 e59ccd5..78af546 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)