You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sz...@apache.org on 2012/11/28 01:41:23 UTC
svn commit: r1414484 - in /hadoop/common/branches/branch-1-win: ./
CHANGES.txt src/test/org/apache/hadoop/net/TestNetUtils.java
Author: szetszwo
Date: Wed Nov 28 00:41:22 2012
New Revision: 1414484
URL: http://svn.apache.org/viewvc?rev=1414484&view=rev
Log:
svn merge -c 1414483 from branch-1 for HADOOP-9099. TestNetUtils fails if "UnknownHost" is resolved as a valid hostname.
Modified:
hadoop/common/branches/branch-1-win/ (props changed)
hadoop/common/branches/branch-1-win/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/net/TestNetUtils.java
Propchange: hadoop/common/branches/branch-1-win/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1:r1414483
Modified: hadoop/common/branches/branch-1-win/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.txt?rev=1414484&r1=1414483&r2=1414484&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1-win/CHANGES.txt Wed Nov 28 00:41:22 2012
@@ -37,6 +37,9 @@ Release 1.2.0 - unreleased
handles hostname starting with a numeric character. (Jing Zhao via
szetszwo)
+ HADOOP-9099. TestNetUtils fails if "UnknownHost" is resolved as a valid
+ hostname. (Ivan Mitic via szetszwo)
+
Release 1.1.1 - Unreleased
INCOMPATIBLE CHANGES
Propchange: hadoop/common/branches/branch-1-win/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1/CHANGES.txt:r1414483
Modified: hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/net/TestNetUtils.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/net/TestNetUtils.java?rev=1414484&r1=1414483&r2=1414484&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/net/TestNetUtils.java (original)
+++ hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/net/TestNetUtils.java Wed Nov 28 00:41:22 2012
@@ -332,7 +332,7 @@ public class TestNetUtils {
@Test
public void testNormalizeHostName() {
List<String> hosts = Arrays.asList(new String[] { "127.0.0.1", "localhost",
- "3w.org", "UnknownHost" });
+ "3w.org", "UnknownHost123" });
List<String> normalizedHosts = NetUtils.normalizeHostNames(hosts);
// when ipaddress is normalized, same address is expected in return
assertEquals(normalizedHosts.get(0), hosts.get(0));