From 27cc6911ea254ab6a3ac8dc19631ff6a40e3c2cb Mon Sep 17 00:00:00 2001 From: Jing Zhao Date: Wed, 18 Sep 2013 21:34:42 +0000 Subject: [PATCH] Merge change r1524581 from trunk: move HDFS-5122 from Release 2.1.1-beta to Release 2.3.0 in CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524583 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 e5406d14c3a..8b1b2fa8282 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -6,6 +6,9 @@ Release 2.3.0 - UNRELEASED NEW FEATURES + HDFS-5122. Support failover and retry in WebHdfsFileSystem for NN HA. + (Haohui Mai via jing9) + IMPROVEMENTS HDFS-4657. Limit the number of blocks logged by the NN after a block @@ -125,9 +128,6 @@ Release 2.1.1-beta - 2013-09-23 HDFS-5199 Add more debug trace for NFS READ and WRITE. (brandonli) - HDFS-5122. Support failover and retry in WebHdfsFileSystem for NN HA. - (Haohui Mai via jing9) - IMPROVEMENTS HDFS-4513. Clarify in the WebHDFS REST API that all JSON respsonses may