Repository: hadoop Updated Branches: refs/heads/trunk f4b7e99f4 -> 428dfaad6
Update CHANGES.txt after merging HDFS-6252 and HDFS-6657 to branch-2. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/428dfaad Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/428dfaad Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/428dfaad Branch: refs/heads/trunk Commit: 428dfaad60d3088059927cc91ed759f8193c334c Parents: f4b7e99 Author: Haohui Mai <[email protected]> Authored: Fri Oct 10 17:32:14 2014 -0700 Committer: Haohui Mai <[email protected]> Committed: Fri Oct 10 17:32:14 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/428dfaad/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 3a3cde6..2575097 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -128,8 +128,6 @@ Trunk (Unreleased) HDFS-6246. Remove 'dfs.support.append' flag from trunk code. (umamahesh) - HDFS-6252. Phase out the old web UI in HDFS. (wheat9) - HDFS-6609. Use DirectorySnapshottableFeature to represent a snapshottable directory. (Jing Zhao via wheat9) @@ -249,9 +247,6 @@ Trunk (Unreleased) HDFS-5794. Fix the inconsistency of layout version number of ADD_DATANODE_AND_STORAGE_UUIDS between trunk and branch-2. (jing9) - HDFS-6657. Remove link to 'Legacy UI' in trunk's Namenode UI. - (Vinayakumar B via wheat 9) - HDFS-6694. TestPipelinesFailover.testPipelineRecoveryStress tests fail intermittently with various symptoms - debugging patch. (Yongjun Zhang via Arpit Agarwal) @@ -381,6 +376,8 @@ Release 2.7.0 - UNRELEASED HDFS-7209. Populate EDEK cache when creating encryption zone. (Yi Liu via wang) + HDFS-6252. Phase out the old web UI in HDFS. (wheat9) + OPTIMIZATIONS BUG FIXES @@ -391,6 +388,9 @@ Release 2.7.0 - UNRELEASED HDFS-7198. Fix or suppress findbugs "unchecked conversion" warning in DFSClient#getPathTraceScope (cmccabe) + HDFS-6657. Remove link to 'Legacy UI' in trunk's Namenode UI. + (Vinayakumar B via wheat) + Release 2.6.0 - UNRELEASED INCOMPATIBLE CHANGES
