Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 4737d4686 -> a30043ca2
HDFS-9779 . TestReplicationPolicyWithNodeGroup NODE variable picks wrong rack
value. Contributed by Kuhu Shukla.
(cherry picked from commit a7fce9ab415fcc834ca1d91f913157ffd103fa5f)
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/a30043ca
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a30043ca
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a30043ca
Branch: refs/heads/branch-2.7
Commit: a30043ca26814a9e6c31169c0b7ca0bea79c2c10
Parents: 4737d46
Author: Kihwal Lee <[email protected]>
Authored: Thu Feb 11 08:15:35 2016 -0600
Committer: Kihwal Lee <[email protected]>
Committed: Thu Feb 11 08:15:35 2016 -0600
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 4 ++++
.../blockmanagement/TestReplicationPolicyWithNodeGroup.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a30043ca/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 5ad7419..3470ffd 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -95,6 +95,10 @@ Release 2.7.3 - UNRELEASED
HDFS-9752. Permanent write failures may happen to slow writers during
datanode rolling upgrades (Walter Su via kihwal)
+ HDFS-9779 . TestReplicationPolicyWithNodeGroup NODE variable picks wrong
rack value
+ (Kuhu Shukla via umamahesh)
+
+
HDFS-9784. Example usage is not correct in Transparent Encryption document.
(Takashi Ohnishi via aajisaka)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a30043ca/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicyWithNodeGroup.java
----------------------------------------------------------------------
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicyWithNodeGroup.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicyWithNodeGroup.java
index 2edb42f..8a87320 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicyWithNodeGroup.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicyWithNodeGroup.java
@@ -115,7 +115,7 @@ public class TestReplicationPolicyWithNodeGroup {
};
private final static DatanodeDescriptor NODE =
- new DatanodeDescriptor(DFSTestUtil.getDatanodeDescriptor("9.9.9.9",
"/d2/r4/n7"));
+ DFSTestUtil.getDatanodeDescriptor("9.9.9.9", "/d2/r4/n7");
private static final DatanodeStorageInfo[] storagesForDependencies;
private static final DatanodeDescriptor[] dataNodesForDependencies;