From 2ad014a097c0b31e38ece0b7928c3544899b2611 Mon Sep 17 00:00:00 2001 From: Uma Maheswara Rao G Date: Sun, 15 Jun 2014 14:54:36 +0000 Subject: [PATCH] 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 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 9 ++++++--- hadoop-mapreduce-project/CHANGES.txt | 10 +++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 04b485f9ef..eb0504e955 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -254,9 +254,6 @@ Trunk (Unreleased) HDFS-5794. Fix the inconsistency of layout version number of 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. (Charles Lamb via wang) @@ -633,6 +630,12 @@ Release 2.5.0 - UNRELEASED HDFS-6503. Fix typo of DFSAdmin restoreFailedStorage. (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 HDFS-6299. Protobuf for XAttr and client-side implementation. (Yi Liu via umamahesh) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 9642050aae..2320af014e 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -145,11 +145,6 @@ Trunk (Unreleased) MAPREDUCE-5867. Fix NPE in KillAMPreemptionPolicy related to 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 INCOMPATIBLE CHANGES @@ -264,6 +259,11 @@ Release 2.5.0 - UNRELEASED MAPREDUCE-5777. Support utf-8 text with Byte Order Marker. (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 INCOMPATIBLE CHANGES