Author: sseth
Date: Wed Sep 25 00:38:28 2013
New Revision: 1526068
URL: http://svn.apache.org/r1526068
Log:
merge YARN-1229 from branch-2. Define constraints on Auxiliary Service names.
Change ShuffleHandler service name from mapreduce.shuffle to mapreduce_shuffle.
Contributed by Xuan Gong.
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1526068&r1=1526067&r2=1526068&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Wed Sep 25 00:38:28 2013
@@ -12,6 +12,18 @@ Release 2.2.0 - UNRELEASED
BUG FIXES
+Release 2.1.2 - UNRELEASED
+
+ INCOMPATIBLE CHANGES
+
+ NEW FEATURES
+
+ IMPROVEMENTS
+
+ OPTIMIZATIONS
+
+ BUG FIXES
+
HDFS-5139. Remove redundant -R option from setrep.
HDFS-5251. Race between the initialization of NameNode and the http
