From ebb9a704bd7c7c7ddb8a44c74bb1107425ee0e83 Mon Sep 17 00:00:00 2001 From: Jing Zhao Date: Fri, 17 Jan 2014 18:29:38 +0000 Subject: [PATCH] Move HDFS-5704 and HDFS-5777 to the correct section in CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1559210 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index a31c9fa136..1345d90eeb 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -484,9 +484,8 @@ Trunk (Unreleased) HDFS-5775. Consolidate the code for serialization in CacheManager (Haohui Mai via brandonli) - HDFS-5704. Change OP_UPDATE_BLOCKS with a new OP_ADD_BLOCK. (jing9) - - HDFS-5777. Update LayoutVersion for the new editlog op OP_ADD_BLOCK. (jing9) + HDFS-5794. Fix the inconsistency of layout version number of + ADD_DATANODE_AND_STORAGE_UUIDS between trunk and branch-2. (jing9) Release 2.4.0 - UNRELEASED @@ -694,6 +693,8 @@ Release 2.4.0 - UNRELEASED InvalidEncryptionKeyException in fetchBlockByteRange (Liang Xie via Colin Patrick McCabe) + HDFS-5704. Change OP_UPDATE_BLOCKS with a new OP_ADD_BLOCK. (jing9) + OPTIMIZATIONS HDFS-5239. Allow FSNamesystem lock fairness to be configurable (daryn) @@ -772,8 +773,7 @@ Release 2.4.0 - UNRELEASED HDFS-5579. Under construction files make DataNode decommission take very long hours. (zhaoyunjiong via jing9) - HDFS-5794. Fix the inconsistency of layout version number of - ADD_DATANODE_AND_STORAGE_UUIDS between trunk and branch-2. (jing9) + HDFS-5777. Update LayoutVersion for the new editlog op OP_ADD_BLOCK. (jing9) BREAKDOWN OF HDFS-2832 SUBTASKS AND RELATED JIRAS