Skip to content

Commit 09f36b1

Browse files
committed
HDFS-7387. Merging to branch-2.6 for hadoop-2.6.0-rc1.
1 parent 8405ec0 commit 09f36b1

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,6 @@ Release 2.7.0 - UNRELEASED
161161
HDFS-7366. BlockInfo should take replication as an short in the constructor.
162162
(Li Lu via wheat9)
163163

164-
HDFS-7387. NFS may only do partial commit due to a race between COMMIT and write
165-
(brandonli)
166-
167164
HDFS-7389. Named user ACL cannot stop the user from accessing the FS entity.
168165
(Vinayakumar B via cnauroth)
169166

@@ -790,6 +787,9 @@ Release 2.6.0 - 2014-11-15
790787
HDFS-7383. DataNode.requestShortCircuitFdsForRead may throw
791788
NullPointerException. (szetszwo via suresh)
792789

790+
HDFS-7387. NFS may only do partial commit due to a race between COMMIT and write
791+
(brandonli)
792+
793793
BREAKDOWN OF HDFS-6581 SUBTASKS AND RELATED JIRAS
794794

795795
HDFS-6921. Add LazyPersist flag to FileStatus. (Arpit Agarwal)

0 commit comments

Comments
 (0)