From b4d07574babeae8ecc627030d1e9d7233a63c0db Mon Sep 17 00:00:00 2001 From: Aaron Myers Date: Fri, 18 Jul 2014 21:10:43 +0000 Subject: [PATCH] Move CHANGES.txt info for HDFS-6632 from 2.6 to 2.5 section. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611808 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 3460d502232..51d65c333c2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -92,9 +92,6 @@ Release 2.6.0 - UNRELEASED HDFS-6667. In HDFS HA mode, Distcp/SLive with webhdfs on secure cluster fails with Client cannot authenticate via:[TOKEN, KERBEROS] error. (jing9) - HDFS-6632. Reintroduce dfs.http.port / dfs.https.port in branch-2. - (Yongjun Zhang via wheat9) - Release 2.5.0 - UNRELEASED INCOMPATIBLE CHANGES @@ -624,6 +621,9 @@ Release 2.5.0 - UNRELEASED HDFS-6378. NFS registration should timeout instead of hanging when portmap/rpcbind is not available (Abhiraj Butala via brandonli) + HDFS-6632. Reintroduce dfs.http.port / dfs.https.port in branch-2. + (Yongjun Zhang via wheat9) + BREAKDOWN OF HDFS-2006 SUBTASKS AND RELATED JIRAS HDFS-6299. Protobuf for XAttr and client-side implementation. (Yi Liu via umamahesh)