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 4177411348 for ; Tue, 9 Sep 2014 20:32:40 +0000 (UTC) Received: (qmail 42613 invoked by uid 500); 9 Sep 2014 20:32:40 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 42555 invoked by uid 500); 9 Sep 2014 20:32:40 -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 42546 invoked by uid 99); 9 Sep 2014 20:32:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Sep 2014 20:32:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 978E48098; Tue, 9 Sep 2014 20:32:39 +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 Message-Id: <7b53a354cbfd4bce85e3151b5830642c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: HDFS-6482. Fix CHANGES.txt in trunk Date: Tue, 9 Sep 2014 20:32:39 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/HDFS-6581 61ccd5036 -> be30c86cc HDFS-6482. Fix CHANGES.txt in trunk Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/be30c86c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/be30c86c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/be30c86c Branch: refs/heads/HDFS-6581 Commit: be30c86cc9f71894dc649ed22983e5c42e9b6951 Parents: 61ccd50 Author: arp Authored: Tue Sep 9 13:32:08 2014 -0700 Committer: arp Committed: Tue Sep 9 13:32:08 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/be30c86c/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 2686306..41f87db 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -130,9 +130,6 @@ Trunk (Unreleased) HDFS-6609. Use DirectorySnapshottableFeature to represent a snapshottable directory. (Jing Zhao via wheat9) - HDFS-6482. Use block ID-based block layout on datanodes (James Thomas via - Colin Patrick McCabe) - OPTIMIZATIONS BUG FIXES @@ -457,6 +454,9 @@ Release 2.6.0 - UNRELEASED HDFS-6036. Forcibly timeout misbehaving DFSClients that try to do no-checksum reads that extend too long (cmccabe) + HDFS-6482. Use block ID-based block layout on datanodes (James Thomas via + Colin Patrick McCabe) + OPTIMIZATIONS HDFS-6690. Deduplicate xattr names in memory. (wang)