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 2A0AC17CEC for ; Wed, 18 Mar 2015 19:53:27 +0000 (UTC) Received: (qmail 61609 invoked by uid 500); 18 Mar 2015 19:53:26 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 61394 invoked by uid 500); 18 Mar 2015 19:53:26 -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 61117 invoked by uid 99); 18 Mar 2015 19:53:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Mar 2015 19:53:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1978AE18CA; Wed, 18 Mar 2015 19:53:26 +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: Wed, 18 Mar 2015 19:53:28 -0000 Message-Id: <93e20dc338d244a5a2d066a7c883dc1b@git.apache.org> In-Reply-To: <332edf602e7644cfac2e77ce2b84836b@git.apache.org> References: <332edf602e7644cfac2e77ce2b84836b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] hadoop git commit: Fix CHANGES.txt for HDFS-7722. Fix CHANGES.txt for HDFS-7722. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5f7926dc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5f7926dc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5f7926dc Branch: refs/heads/branch-2.7 Commit: 5f7926dcf097b489fdac5f91dc6498df874e3283 Parents: 2b589da Author: Arpit Agarwal Authored: Wed Mar 18 12:52:42 2015 -0700 Committer: Arpit Agarwal Committed: Wed Mar 18 12:53:02 2015 -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/5f7926dc/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 0c9f27b..62cf1e5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -865,6 +865,9 @@ Release 2.7.0 - UNRELEASED TestFsDatasetImpl#testAddVolumeFailureReleasesInUseLock on Linux (Xiaoyu Yao via Arpit Agarwal) + HDFS-7722. DataNode#checkDiskError should also remove Storage when error + is found. (Lei Xu via Colin P. McCabe) + BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS HDFS-7720. Quota by Storage Type API, tools and ClientNameNode @@ -885,9 +888,6 @@ Release 2.7.0 - UNRELEASED HDFS-7806. Refactor: move StorageType from hadoop-hdfs to hadoop-common. (Xiaoyu Yao via Arpit Agarwal) - HDFS-7722. DataNode#checkDiskError should also remove Storage when error - is found. (Lei Xu via Colin P. McCabe) - Release 2.6.1 - UNRELEASED INCOMPATIBLE CHANGES