From 4f7ae1760248d04f5dae854085771a859f1d1970 Mon Sep 17 00:00:00 2001 From: Jing Zhao Date: Wed, 11 Dec 2013 02:34:23 +0000 Subject: [PATCH] Move HDFS-5283 to section branch-2.3.0 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550033 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 8c01ce078c6..0e91371e938 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -173,9 +173,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) @@ -337,6 +334,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)