From 332cf8faebedba9cdad042b96ebfefa22d55badb Mon Sep 17 00:00:00 2001 From: Tsz-wo Sze Date: Sat, 1 Jun 2013 23:02:10 +0000 Subject: [PATCH] svn merge -c 1488630 from trunk for moving HDFS-4826 to 2.1.0-beta. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488631 13f79535-47bb-0310-9956-ffa450edef68 --- 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 eb1373ea0db..5ef29d64245 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -122,9 +122,6 @@ Release 2.1.0-beta - UNRELEASED HDFS-4698. Provide client-side metrics for remote reads, local reads, and short-circuit reads. (Colin Patrick McCabe via atm) - HDFS-4826. TestNestedSnapshots times out due to repeated slow edit log - flushes when running on virtualized disk. (Chris Nauroth via szetszwo) - OPTIMIZATIONS BUG FIXES @@ -783,6 +780,9 @@ Release 2.1.0-beta - UNRELEASED HDFS-4848. copyFromLocal and renaming a file to ".snapshot" should output that ".snapshot" is a reserved name. (Jing Zhao via brandonli) + HDFS-4826. TestNestedSnapshots times out due to repeated slow edit log + flushes when running on virtualized disk. (Chris Nauroth via szetszwo) + Release 2.0.5-alpha - UNRELEASED INCOMPATIBLE CHANGES