Merge back changelog entries for HDFS-3042 into main CHANGES.txt files

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1345307 13f79535-47bb-0310-9956-ffa450edef68

hadoop-common-project/hadoop-common/CHANGES.HDFS-3042.txt

@@ -1,29 +0,0 @@
-Changes for HDFS-3042 branch.
-
-This change list will be merged into the trunk CHANGES.txt when the HDFS-3-42
-branch is merged.
-------------------------------
-
-HADOOP-8220. ZKFailoverController doesn't handle failure to become active correctly (todd)
-
-HADOOP-8228. Auto HA: Refactor tests and add stress tests. (todd)
-
-HADOOP-8215. Security support for ZK Failover controller (todd)
-
-HADOOP-8245. Fix flakiness in TestZKFailoverController (todd)
-
-HADOOP-8257. TestZKFailoverControllerStress occasionally fails with Mockito error (todd)
-
-HADOOP-8260. Replace ClientBaseWithFixes with our own modified copy of the class (todd)
-
-HADOOP-8246. Auto-HA: automatically scope znode by nameservice ID (todd)
-
-HADOOP-8247. Add a config to enable auto-HA, which disables manual FailoverController (todd)
-
-HADOOP-8306. ZKFC: improve error message when ZK is not running. (todd)
-
-HADOOP-8279. Allow manual failover to be invoked when auto-failover is enabled. (todd)
-
-HADOOP-8276. Auto-HA: add config for java options to pass to zkfc daemon (todd via eli)
-
-HADOOP-8405. ZKFC tests leak ZK instances. (todd)

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -12,6 +12,9 @@ Trunk (unreleased changes)
     HADOOP-8135. Add ByteBufferReadable interface to FSDataInputStream. (Henry
     Robinson via atm)
 
+    HDFS-3042. Automatic failover support for NameNode HA (todd)
+    (see dedicated section below for breakdown of subtasks)
+
   IMPROVEMENTS
 
     HADOOP-8017. Configure hadoop-main pom to get rid of M2E plugin execution
@@ -162,6 +165,38 @@ Trunk (unreleased changes)
 
     HADOOP-7761. Improve the performance of raw comparisons. (todd)
 
+  BREAKDOWN OF HDFS-3042 SUBTASKS
+
+    HADOOP-8220. ZKFailoverController doesn't handle failure to become active
+    correctly (todd)
+    
+    HADOOP-8228. Auto HA: Refactor tests and add stress tests. (todd)
+    
+    HADOOP-8215. Security support for ZK Failover controller (todd)
+    
+    HADOOP-8245. Fix flakiness in TestZKFailoverController (todd)
+    
+    HADOOP-8257. TestZKFailoverControllerStress occasionally fails with Mockito
+    error (todd)
+    
+    HADOOP-8260. Replace ClientBaseWithFixes with our own modified copy of the
+    class (todd)
+    
+    HADOOP-8246. Auto-HA: automatically scope znode by nameservice ID (todd)
+    
+    HADOOP-8247. Add a config to enable auto-HA, which disables manual
+    FailoverController (todd)
+    
+    HADOOP-8306. ZKFC: improve error message when ZK is not running. (todd)
+    
+    HADOOP-8279. Allow manual failover to be invoked when auto-failover is
+    enabled. (todd)
+    
+    HADOOP-8276. Auto-HA: add config for java options to pass to zkfc daemon
+    (todd via eli)
+    
+    HADOOP-8405. ZKFC tests leak ZK instances. (todd)
+
 Release 2.0.1-alpha - UNRELEASED
 
   INCOMPATIBLE CHANGES

hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-3042.txt

@@ -1,19 +0,0 @@
-Changes for HDFS-3042 branch.
-
-This change list will be merged into the trunk CHANGES.txt when the HDFS-3042
-branch is merged.
-------------------------------
-
-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)

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -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