Repository: hadoop
Updated Branches:
  refs/heads/trunk e96ce6f3e -> 840825d81


Add HDFS-7148 to CHANGES.txt, branch-2 only commit.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/840825d8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/840825d8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/840825d8

Branch: refs/heads/trunk
Commit: 840825d819f6df5c8e88749fa8d2d93916cd55eb
Parents: e96ce6f
Author: Andrew Wang <[email protected]>
Authored: Thu Sep 25 21:50:24 2014 -0700
Committer: Andrew Wang <[email protected]>
Committed: Thu Sep 25 21:50:24 2014 -0700

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/840825d8/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 de691f2..ffba357 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -819,6 +819,9 @@ Release 2.6.0 - UNRELEASED
     HDFS-7132. hdfs namenode -metadataVersion command does not honor
     configured name dirs. (Charles Lamb via wang)
 
+    HDFS-7148. TestEncryptionZones#testIsEncryptedMethod fails on branch-2
+    after archival storage merge. (wang)
+
     BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
   
       HDFS-6387. HDFS CLI admin tool for creating & deleting an

Reply via email to