Repository: hadoop
Updated Branches:
refs/heads/branch-2 2cbbf76c3 -> 20bb5c403
Revert "HADOOP-12687. SecureUtil#QualifiedHostResolver#getByName should also
try to resolve direct hostname (Sunil G via rohithsharmaks)"
This reverts commit 2b252844e04eebd4f32815d4bd6f914c02994709.
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
(cherry picked from commit ed18527e38438113fdf2f48b08be5ec283a5f481)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/20bb5c40
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/20bb5c40
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/20bb5c40
Branch: refs/heads/branch-2
Commit: 20bb5c403e7a615da27dcf1dba33b7be08ba8cd0
Parents: 2cbbf76
Author: rohithsharmaks <[email protected]>
Authored: Fri Jan 8 14:30:28 2016 +0530
Committer: rohithsharmaks <[email protected]>
Committed: Fri Jan 8 14:37:01 2016 +0530
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 4 ----
.../src/main/java/org/apache/hadoop/security/SecurityUtil.java | 6 ------
2 files changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/20bb5c40/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 58f49a0..40b47cb 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -20,10 +20,6 @@ Release 2.9.0 - UNRELEASED
BUG FIXES
- HADOOP-12687. SecureUtil#QualifiedHostResolver#getByName should also try to
- resolve direct hostname, incase multiple loopback addresses are present in
- /etc/hosts (Sunil G via rohithsharmaks)
-
HADOOP-12655. TestHttpServer.testBindAddress bind port range is wider
than expected. (Wei-Chiu Chuang via stevel)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/20bb5c40/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
----------------------------------------------------------------------
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
index 714c923..38096ab 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
@@ -580,13 +580,7 @@ public class SecurityUtil {
addr = getByNameWithSearch(host);
if (addr == null) {
addr = getByExactName(host);
- // If multiple loopback addresses are present, a direct lookup
- // will be helpful
- if (addr == null) {
- addr = InetAddress.getByName(host);
- }
}
-
}
}
// unresolvable!
