From 5f81675aea721923c8adaa7f2dc7c1a5c85d2e5a Mon Sep 17 00:00:00 2001 From: Karthik Kambatla Date: Tue, 5 Aug 2014 22:49:34 +0000 Subject: [PATCH] Edit CHANGES.txt files to move HADOOP-10759 and HDFS-6717 from 2.5.0 to 2.6.0 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616037 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 4 ++-- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index c9780362665..4ed39ae1457 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -106,6 +106,8 @@ Release 2.6.0 - UNRELEASED HADOOP-10933. FileBasedKeyStoresFactory Should use Configuration.getPassword for SSL Passwords. (lmccay via tucu) + HADOOP-10759. Remove hardcoded JAVA_HEAP_MAX. (Sam Liu via Eric Yang) + Release 2.5.0 - UNRELEASED INCOMPATIBLE CHANGES @@ -248,8 +250,6 @@ Release 2.5.0 - UNRELEASED BUG FIXES - HADOOP-10759. Remove hardcoded JAVA_HEAP_MAX. (Sam Liu via Eric Yang) - HADOOP-10378. Typo in help printed by hdfs dfs -help. (Mit Desai via suresh) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 5e2a250e5b9..352e857d507 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -185,6 +185,9 @@ Release 2.6.0 - UNRELEASED HDFS-6451. NFS should not return NFS3ERR_IO for AccessControlException (Abhiraj Butala via brandonli) + HDFS-6717. JIRA HDFS-5804 breaks default nfs-gateway behavior for unsecured config + (brandonli) + Release 2.5.0 - UNRELEASED INCOMPATIBLE CHANGES @@ -742,9 +745,6 @@ Release 2.5.0 - UNRELEASED HDFS-6723. New NN webUI no longer displays decommissioned state for dead node. (Ming Ma via wheat9) - HDFS-6717. JIRA HDFS-5804 breaks default nfs-gateway behavior for unsecured config - (brandonli) - HDFS-6768. Fix a few unit tests that use hard-coded port numbers. (Arpit Agarwal)