From 6cec97be4b66e7e6f6b63beb672fa1c546838acd Mon Sep 17 00:00:00 2001 From: Suresh Srinivas Date: Thu, 2 May 2013 21:31:23 +0000 Subject: [PATCH] HDFS-4785 and HDFS-4784 are moved to 2.0.5 release section git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1478563 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 4329d145cb8..540c4bc7fb0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -270,11 +270,6 @@ Trunk (Unreleased) HDFS-4687. TestDelegationTokenForProxyUser#testWebHdfsDoAs is flaky with JDK7. (Andrew Wang via atm) - HDFS-4785. Concat operation does not remove concatenated files from - InodeMap. (suresh) - - HDFS-4784. NPE in FSDirectory.resolvePath(). (Brandon Li via suresh) - BREAKDOWN OF HADOOP-8562 and HDFS-3602 SUBTASKS AND RELATED JIRAS HDFS-4145. Merge hdfs cmd line scripts from branch-1-win. (David Lao, @@ -627,6 +622,11 @@ Release 2.0.5-beta - UNRELEASED HDFS-4778. Fixes some issues that the first patch on HDFS-2576 missed. (ddas) + HDFS-4785. Concat operation does not remove concatenated files from + InodeMap. (suresh) + + HDFS-4784. NPE in FSDirectory.resolvePath(). (Brandon Li via suresh) + Release 2.0.4-alpha - UNRELEASED INCOMPATIBLE CHANGES