Moved CHANGES.txt entries of MAPREDUCE-5898, MAPREDUCE-5920, HDFS-6464, HDFS-6375 from trunk to 2.5 section on merging HDFS-2006 to branch-2

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1602699 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uma Maheswara Rao G 2014-06-15 14:54:36 +00:00
parent d18af7edd4
commit 2ad014a097
2 changed files with 11 additions and 8 deletions

View File

@ -254,9 +254,6 @@ Trunk (Unreleased)
HDFS-5794. Fix the inconsistency of layout version number of HDFS-5794. Fix the inconsistency of layout version number of
ADD_DATANODE_AND_STORAGE_UUIDS between trunk and branch-2. (jing9) ADD_DATANODE_AND_STORAGE_UUIDS between trunk and branch-2. (jing9)
HDFS-6464. Support multiple xattr.name parameters for WebHDFS getXAttrs.
(Yi Liu via umamahesh)
HDFS-6375. Listing extended attributes with the search permission. HDFS-6375. Listing extended attributes with the search permission.
(Charles Lamb via wang) (Charles Lamb via wang)
@ -633,6 +630,12 @@ Release 2.5.0 - UNRELEASED
HDFS-6503. Fix typo of DFSAdmin restoreFailedStorage. HDFS-6503. Fix typo of DFSAdmin restoreFailedStorage.
(Zesheng Wu via wheat9) (Zesheng Wu via wheat9)
HDFS-6464. Support multiple xattr.name parameters for WebHDFS getXAttrs.
(Yi Liu via umamahesh)
HDFS-6375. Listing extended attributes with the search permission.
(Charles Lamb via wang)
BREAKDOWN OF HDFS-2006 SUBTASKS AND RELATED JIRAS BREAKDOWN OF HDFS-2006 SUBTASKS AND RELATED JIRAS
HDFS-6299. Protobuf for XAttr and client-side implementation. (Yi Liu via umamahesh) HDFS-6299. Protobuf for XAttr and client-side implementation. (Yi Liu via umamahesh)

View File

@ -145,11 +145,6 @@ Trunk (Unreleased)
MAPREDUCE-5867. Fix NPE in KillAMPreemptionPolicy related to MAPREDUCE-5867. Fix NPE in KillAMPreemptionPolicy related to
ProportionalCapacityPreemptionPolicy (Sunil G via devaraj) ProportionalCapacityPreemptionPolicy (Sunil G via devaraj)
MAPREDUCE-5898. distcp to support preserving HDFS extended attributes(XAttrs)
(Yi Liu via umamahesh)
MAPREDUCE-5920. Add Xattr option in DistCp docs. (Yi Liu via cnauroth)
Release 2.5.0 - UNRELEASED Release 2.5.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES
@ -264,6 +259,11 @@ Release 2.5.0 - UNRELEASED
MAPREDUCE-5777. Support utf-8 text with Byte Order Marker. MAPREDUCE-5777. Support utf-8 text with Byte Order Marker.
(Zhihai Xu via kasha) (Zhihai Xu via kasha)
MAPREDUCE-5898. distcp to support preserving HDFS extended attributes(XAttrs)
(Yi Liu via umamahesh)
MAPREDUCE-5920. Add Xattr option in DistCp docs. (Yi Liu via cnauroth)
Release 2.4.1 - UNRELEASED Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES