reverted CHANGES.txt for HDFS-7225.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/084674aa Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/084674aa Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/084674aa Branch: refs/heads/sjlee/hdfs-merge Commit: 084674aa28e841a68d97cec98289d1ad137ece6c Parents: 33fb7b4 Author: Sangjin Lee <sj...@apache.org> Authored: Wed Aug 12 22:16:27 2015 -0700 Committer: Sangjin Lee <sj...@apache.org> Committed: Wed Aug 12 22:16:27 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/084674aa/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 cc4d2ab..47ec910 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -35,9 +35,6 @@ Release 2.6.1 - UNRELEASED HDFS-8486. DN startup may cause severe data loss. (daryn via cmccabe) - HDFS-7225. Remove stale block invalidation work when DN re-registers with - different UUID. (Zhe Zhang and Andrew Wang) - Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES
