HDFS-7387. Merging to branch-2.6 for hadoop-2.6.0-rc1.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/782abbb0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/782abbb0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/782abbb0 Branch: refs/heads/HDFS-EC Commit: 782abbb000ab1c9e2e033e347eea8827d6e866ef Parents: be7bf95 Author: Arun C. Murthy <acmur...@apache.org> Authored: Wed Nov 12 11:32:44 2014 -0800 Committer: Arun C. Murthy <acmur...@apache.org> Committed: Wed Nov 12 11:32:44 2014 -0800 ---------------------------------------------------------------------- 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/782abbb0/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 ea89344..cd8814e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -413,9 +413,6 @@ Release 2.7.0 - UNRELEASED HDFS-7366. BlockInfo should take replication as an short in the constructor. (Li Lu via wheat9) - HDFS-7387. NFS may only do partial commit due to a race between COMMIT and write - (brandonli) - HDFS-7389. Named user ACL cannot stop the user from accessing the FS entity. (Vinayakumar B via cnauroth) @@ -1430,6 +1427,9 @@ Release 2.6.0 - 2014-11-15 HDFS-7383. DataNode.requestShortCircuitFdsForRead may throw NullPointerException. (szetszwo via suresh) + HDFS-7387. NFS may only do partial commit due to a race between COMMIT and write + (brandonli) + Release 2.5.2 - 2014-11-10 INCOMPATIBLE CHANGES