Author: wang
Date: Wed Aug 20 18:56:56 2014
New Revision: 1619203
URL: http://svn.apache.org/r1619203
Log:
Fix up CHANGES.txt for HDFS-6134, HADOOP-10150 and related JIRAs.
Removed:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES-fs-encryption.txt
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1619203&r1=1619202&r2=1619203&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Wed Aug 20
18:56:56 2014
@@ -154,6 +154,16 @@ Trunk (Unreleased)
MAPREDUCE-5867. Fix NPE in KillAMPreemptionPolicy related to
ProportionalCapacityPreemptionPolicy (Sunil G via devaraj)
+ BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
+
+ MAPREDUCE-5890. Support for encrypting Intermediate
+ data and spills in local filesystem. (asuresh via tucu)
+
+ MAPREDUCE-6007. Add support to distcp to preserve raw.* namespace
+ extended attributes. (clamb)
+
+ MAPREDUCE-6041. Fix TestOptionsParser. (clamb)
+
Release 2.6.0 - UNRELEASED
INCOMPATIBLE CHANGES
