From eee35a69720f86f33a61e3cd2b61ef68cf9c4aa0 Mon Sep 17 00:00:00 2001 From: Robert Joseph Evans Date: Wed, 4 Apr 2012 16:24:38 +0000 Subject: [PATCH] svn merge -c 1309481 FIXES: MAPREDUCE-3650. testGetTokensForHftpFS() fails (Ravi Prakash via bobby) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309482 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 1 + .../org/apache/hadoop/mapreduce/security/TestTokenCache.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index ef42847408c..936a0005cfa 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -152,6 +152,7 @@ Release 0.23.3 - UNRELEASED MAPREDUCE-3082. Archive command take wrong path for input file with current directory (John George via bobby) + MAPREDUCE-3650. testGetTokensForHftpFS() fails (Ravi Prakash via bobby) Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCache.java b/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCache.java index 468a1097341..768c4d86c23 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCache.java +++ b/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCache.java @@ -320,7 +320,7 @@ public class TestTokenCache { final Token t = new Token(dtId, dtSecretManager); - final URI uri = new URI("hftp://host:2222/file1"); + final URI uri = new URI("hftp://127.0.0.1:2222/file1"); final String fs_addr = SecurityUtil.buildDTServiceName(uri, NameNode.DEFAULT_PORT); t.setService(new Text(fs_addr));