From 20ec0c0474b134e24944f9a814a9518301b5ec1b Mon Sep 17 00:00:00 2001 From: Arpit Agarwal Date: Wed, 12 Mar 2014 23:13:32 +0000 Subject: [PATCH] HDFS-5705. Update CHANGES.txt for merging the original fix (r1555190) to branch-2 and branch-2.4. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1576989 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index c420cf57814..5151f6563bb 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -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)