From 078f3a9bc7ce9d06ae2de3e65a099ee655bce483 Mon Sep 17 00:00:00 2001 From: Arpit Agarwal Date: Wed, 11 Feb 2015 11:08:32 -0800 Subject: [PATCH] HDFS-7720. Update CHANGES.txt to reflect merge to branch-2. --- 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 625735e1b9..d60a20f149 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -20,9 +20,6 @@ Trunk (Unreleased) HDFS-3689. Add support for variable length block. (jing9) - HDFS-7720. Quota by Storage Type API, tools and ClientNameNode Protocol - changes. (Xiaoyu Yao via Arpit Agarwal) - HDFS-7723. Quota By Storage Type namenode implemenation. (Xiaoyu Yao via Arpit Agarwal) @@ -332,6 +329,9 @@ Release 2.7.0 - UNRELEASED HDFS-7655. Expose truncate API for Web HDFS. (yliu) + HDFS-7720. Quota by Storage Type API, tools and ClientNameNode Protocol + changes. (Xiaoyu Yao via Arpit Agarwal) + IMPROVEMENTS HDFS-7055. Add tracing to DFSInputStream (cmccabe)