You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cn...@apache.org on 2014/11/12 21:10:30 UTC
[2/2] hadoop git commit: HDFS-7387. Merging to branch-2.6 for
hadoop-2.6.0-rc1.
HDFS-7387. Merging to branch-2.6 for hadoop-2.6.0-rc1.
(cherry picked from commit 09f36b1688a375f45c19889e326d5d35249882b1)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/42849e50
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/42849e50
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/42849e50
Branch: refs/heads/branch-2.6
Commit: 42849e5077bd659ac1244c4710a9858215d8abcc
Parents: d0ca88c
Author: Arun C. Murthy <ac...@apache.org>
Authored: Wed Nov 12 11:41:20 2014 -0800
Committer: cnauroth <cn...@apache.org>
Committed: Wed Nov 12 11:51:11 2014 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/42849e50/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 26db8f1..26981a3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -618,6 +618,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)