Move HDFS-4165 from trunk to 2.6.0 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/371ef4ce
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/371ef4ce
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/371ef4ce

Branch: refs/heads/HDFS-6581
Commit: 371ef4cefc65996e41f7072c4f396fe14d2375b1
Parents: 84b9c63
Author: Andrew Wang <[email protected]>
Authored: Mon Sep 29 11:06:44 2014 -0700
Committer: Andrew Wang <[email protected]>
Committed: Mon Sep 29 11:06:44 2014 -0700

----------------------------------------------------------------------
 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/371ef4ce/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 e59ccd5..78af546 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -204,9 +204,6 @@ Trunk (Unreleased)
     HDFS-4115. TestHDFSCLI.testAll fails one test due to number format.
     (Trevor Robinson via suresh)
 
-    HDFS-4165. Faulty sanity check in FsDirectory.unprotectedSetQuota.
-    (Binglin Chang via suresh)
-
     HDFS-4105. The SPNEGO user for secondary namenode should use the web 
     keytab. (Arpit Gupta via jitendra)
 
@@ -518,6 +515,9 @@ Release 2.6.0 - UNRELEASED
 
     HDFS-6519. Document oiv_legacy command (Akira AJISAKA via aw)
 
+    HDFS-4165. Faulty sanity check in FsDirectory.unprotectedSetQuota.
+    (Binglin Chang via suresh)
+
   OPTIMIZATIONS
 
     HDFS-6690. Deduplicate xattr names in memory. (wang)

Reply via email to