Author: atm Date: Fri Jul 18 21:10:43 2014 New Revision: 1611808 URL: http://svn.apache.org/r1611808 Log: Move CHANGES.txt info for HDFS-6632 from 2.6 to 2.5 section.
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1611808&r1=1611807&r2=1611808&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Fri Jul 18 21:10:43 2014 @@ -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)