From 7fa9ea85d47dec1702f113151eb437d5e3155e75 Mon Sep 17 00:00:00 2001 From: Jing Zhao Date: Mon, 7 Dec 2015 13:47:40 -0800 Subject: [PATCH] Move HDFS-9129 from trunk to branch-2.9.0 --- 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 642414f3cd..169968ff7c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -206,9 +206,6 @@ Trunk (Unreleased) HDFS-8968. Erasure coding: a comprehensive I/O throughput benchmark tool. (Rui Li via zhz) - HDFS-9129. Move the safemode block count into BlockManager. (Mingliang Liu - via jing9) - HDFS-8831. Trash Support for deletion in HDFS encryption zone. (xyao) OPTIMIZATIONS @@ -896,6 +893,9 @@ Release 2.9.0 - UNRELEASED HDFS-8947. NameNode, DataNode and NFS gateway to support JvmPauseMonitor as a service. (Sunil G via Stevel) + HDFS-9129. Move the safemode block count into BlockManager. (Mingliang Liu + via jing9) + OPTIMIZATIONS BUG FIXES