Author: arp
Date: Wed Mar 12 23:13:32 2014
New Revision: 1576989
URL: http://svn.apache.org/r1576989
Log:
HDFS-5705. Update CHANGES.txt for merging the original fix (r1555190) to
branch-2 and branch-2.4.
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=1576989&r1=1576988&r2=1576989&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Wed Mar 12
23:13:32 2014
@@ -241,9 +241,6 @@ Trunk (Unreleased)
HDFS-4366. Block Replication Policy Implementation May Skip Higher-Priority
Blocks for Lower-Priority Blocks (Derek Dagit via kihwal)
- HDFS-5705. TestSecondaryNameNodeUpgrade#testChangeNsIDFails may fail due
- to ConcurrentModificationException. (Ted Yu via brandonli)
-
HDFS-5719. FSImage#doRollback() should close prevState before return
(Ted Yu via brandonli)
@@ -603,6 +600,9 @@ Release 2.4.0 - UNRELEASED
HDFS-6079. Timeout for getFileBlockStorageLocations does not work. (wang)
+ HDFS-5705. TestSecondaryNameNodeUpgrade#testChangeNsIDFails may fail due
+ to ConcurrentModificationException. (Ted Yu via brandonli)
+
BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS
HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9)
