From be30c86cc9f71894dc649ed22983e5c42e9b6951 Mon Sep 17 00:00:00 2001 From: arp Date: Tue, 9 Sep 2014 13:32:08 -0700 Subject: [PATCH] HDFS-6482. Fix CHANGES.txt in trunk --- 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 2686306dbd1..41f87dbac12 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -130,9 +130,6 @@ Trunk (Unreleased) HDFS-6609. Use DirectorySnapshottableFeature to represent a snapshottable directory. (Jing Zhao via wheat9) - HDFS-6482. Use block ID-based block layout on datanodes (James Thomas via - Colin Patrick McCabe) - OPTIMIZATIONS BUG FIXES @@ -457,6 +454,9 @@ Release 2.6.0 - UNRELEASED HDFS-6036. Forcibly timeout misbehaving DFSClients that try to do no-checksum reads that extend too long (cmccabe) + HDFS-6482. Use block ID-based block layout on datanodes (James Thomas via + Colin Patrick McCabe) + OPTIMIZATIONS HDFS-6690. Deduplicate xattr names in memory. (wang)