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
This commit is contained in:
Aaron Myers 2014-07-18 21:10:43 +00:00
parent 08aae68182
commit b4d07574ba
1 changed files with 3 additions and 3 deletions

View File

@ -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)