Repository: hadoop Updated Branches: refs/heads/branch-2.7 42aa880df -> 285dad32e
fix merge error in CHANGES.TXT Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/285dad32 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/285dad32 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/285dad32 Branch: refs/heads/branch-2.7 Commit: 285dad32eb514e4400cae3506f69896815494e38 Parents: 42aa880 Author: Kihwal Lee <[email protected]> Authored: Fri Aug 28 15:37:07 2015 -0500 Committer: Kihwal Lee <[email protected]> Committed: Fri Aug 28 15:37:07 2015 -0500 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/285dad32/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 31c6239..b5bb7b0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1,8 +1,5 @@ Hadoop HDFS Change Log - HDFS-8879. Quota by storage type usage incorrectly initialized upon namenode - restart. (xyao) - Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES @@ -35,6 +32,9 @@ Release 2.7.2 - UNRELEASED HDFS-8891. HDFS concat should keep srcs order. (Yong Zhang via jing9) + HDFS-8879. Quota by storage type usage incorrectly initialized upon namenode + restart. (xyao) + Release 2.7.1 - 2015-07-06 INCOMPATIBLE CHANGES
