From 732975be82357938445fa6078bcd46b868e89a37 Mon Sep 17 00:00:00 2001 From: Jing Zhao Date: Wed, 11 Dec 2013 02:31:57 +0000 Subject: [PATCH] Move HDFS-5283 to section branch-2.3.0 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1550032 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 9f90db1ac9..de970ba7d6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -616,9 +616,6 @@ Release 2.4.0 - UNRELEASED HDFS-5352. Server#initLog() doesn't close InputStream in httpfs. (Ted Yu via jing9) - HDFS-5283. Under construction blocks only inside snapshots should not be - counted in safemode threshhold. (Vinay via szetszwo) - HDFS-4376. Fix race conditions in Balancer. (Junping Du via szetszwo) HDFS-5375. hdfs.cmd does not expose several snapshot commands. (cnauroth) @@ -780,6 +777,9 @@ Release 2.3.0 - UNRELEASED HDFS-5353. Short circuit reads fail when dfs.encrypt.data.transfer is enabled. (Colin Patrick McCabe via jing9) + HDFS-5283. Under construction blocks only inside snapshots should not be + counted in safemode threshhold. (Vinay via szetszwo) + HDFS-5257. addBlock() retry should return LocatedBlock with locations else client will get AIOBE. (Vinay via jing9)