HADOOP-10291. Merging r1562353 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562355 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
a01eba048b
commit
01f6aee7d3
|
@ -374,6 +374,9 @@ Release 2.3.0 - UNRELEASED
|
|||
HADOOP-10292. Restore HttpServer from branch-2.2 in branch-2.
|
||||
(Haohui Mai via suresh)
|
||||
|
||||
HADOOP-10291. TestSecurityUtil#testSocketAddrWithIP fails due to test
|
||||
order dependency. (Mit Desai via Arpit Agarwal)
|
||||
|
||||
Release 2.2.0 - 2013-10-13
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -330,7 +330,9 @@ public class TestSecurityUtil {
|
|||
|
||||
@Test
|
||||
public void testSocketAddrWithIP() {
|
||||
verifyServiceAddr("127.0.0.1", "127.0.0.1");
|
||||
String staticHost = "127.0.0.1";
|
||||
NetUtils.addStaticResolution(staticHost, "localhost");
|
||||
verifyServiceAddr(staticHost, "127.0.0.1");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
Loading…
Reference in New Issue