You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by sz...@apache.org on 2013/06/02 01:02:11 UTC
svn commit: r1488631 - in
/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: ./
CHANGES.txt
Author: szetszwo
Date: Sat Jun 1 23:02:10 2013
New Revision: 1488631
URL: http://svn.apache.org/r1488631
Log:
svn merge -c 1488630 from trunk for moving HDFS-4826 to 2.1.0-beta.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/ (props changed)
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs:r1488630
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1488631&r1=1488630&r2=1488631&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Sat Jun 1 23:02:10 2013
@@ -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