Repository: hadoop Updated Branches: refs/heads/branch-2 8405ec089 -> 09f36b168
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/09f36b16 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/09f36b16 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/09f36b16 Branch: refs/heads/branch-2 Commit: 09f36b1688a375f45c19889e326d5d35249882b1 Parents: 8405ec0 Author: Arun C. Murthy <acmur...@apache.org> Authored: Wed Nov 12 11:41:20 2014 -0800 Committer: Arun C. Murthy <acmur...@apache.org> Committed: Wed Nov 12 11:41:20 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/09f36b16/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 2f23f2c..9b9d9ba 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -161,9 +161,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) @@ -790,6 +787,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) + BREAKDOWN OF HDFS-6581 SUBTASKS AND RELATED JIRAS HDFS-6921. Add LazyPersist flag to FileStatus. (Arpit Agarwal)
