Author: todd
Date: Fri Jun 1 18:20:03 2012
New Revision: 1345307
URL: http://svn.apache.org/viewvc?rev=1345307&view=rev
Log:
Merge back changelog entries for HDFS-3042 into main CHANGES.txt files
Removed:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-3042.txt
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1345307&r1=1345306&r2=1345307&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Fri Jun 1
18:20:03 2012
@@ -15,6 +15,9 @@ Trunk (unreleased changes)
HDFS-744. Support hsync in HDFS. (Lars Hofhansl via szetszwo)
+ HDFS-3042. Automatic failover support for NameNode HA (todd)
+ (see dedicated section below for subtask breakdown)
+
IMPROVEMENTS
HDFS-1620. Rename HdfsConstants -> HdfsServerConstants, FSConstants ->
@@ -159,6 +162,22 @@ Trunk (unreleased changes)
HDFS-3462. TestDFSClientRetries.busyTest() should restore default
xceiver count in the config. (Madhukara Phatak via harsh)
+ BREAKDOWN OF HDFS-3042 SUBTASKS
+
+ HDFS-2185. HDFS portion of ZK-based FailoverController (todd)
+
+ HDFS-3200. Scope all ZKFC configurations by nameservice (todd)
+
+ HDFS-3223. add zkfc to hadoop-daemon.sh script (todd)
+
+ HDFS-3261. TestHASafeMode fails on HDFS-3042 branch (todd)
+
+ HDFS-3159. Document NN auto-failover setup and configuration (todd)
+
+ HDFS-3412. Fix findbugs warnings in auto-HA branch (todd)
+
+ HDFS-3432. TestDFSZKFailoverController tries to fail over too early (todd)
+
Release 2.0.1-alpha - UNRELEASED
INCOMPATIBLE CHANGES
