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 1AA6011E9C for ; Thu, 4 Sep 2014 18:07:18 +0000 (UTC) Received: (qmail 53891 invoked by uid 500); 4 Sep 2014 18:07:17 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 53822 invoked by uid 500); 4 Sep 2014 18:07:17 -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 53813 invoked by uid 99); 4 Sep 2014 18:07:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Sep 2014 18:07:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7EA5BA08576; Thu, 4 Sep 2014 18:07:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tucu@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: Fixing HDFS CHANGES.txt, missing HDFS-6905 entry Date: Thu, 4 Sep 2014 18:07:17 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk 91d45f0f0 -> 1a0953614 Fixing HDFS CHANGES.txt, missing HDFS-6905 entry Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1a095361 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1a095361 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1a095361 Branch: refs/heads/trunk Commit: 1a095361414ba660c139f33ae1eee430a3c3446c Parents: 91d45f0 Author: Alejandro Abdelnur Authored: Thu Sep 4 11:05:20 2014 -0700 Committer: Alejandro Abdelnur Committed: Thu Sep 4 11:07:08 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a095361/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 8498b00..27b97cf 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -689,6 +689,8 @@ Release 2.6.0 - UNRELEASED HDFS-2975. Rename with overwrite flag true can make NameNode to stuck in safemode on NN (crash + restart). (Yi Liu via umamahesh) + HDFS-6905. fs-encryption merge triggered release audit failures. (clamb via tucu) + Release 2.5.1 - UNRELEASED INCOMPATIBLE CHANGES