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
This commit is contained in:
Robert Joseph Evans 2012-04-04 16:24:38 +00:00
parent 954327f770
commit eee35a6972
2 changed files with 2 additions and 1 deletions

View File

@ -152,6 +152,7 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-3082. Archive command take wrong path for input file with current MAPREDUCE-3082. Archive command take wrong path for input file with current
directory (John George via bobby) directory (John George via bobby)
MAPREDUCE-3650. testGetTokensForHftpFS() fails (Ravi Prakash via bobby)
Release 0.23.2 - UNRELEASED Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -320,7 +320,7 @@ public class TestTokenCache {
final Token<DelegationTokenIdentifier> t = final Token<DelegationTokenIdentifier> t =
new Token<DelegationTokenIdentifier>(dtId, dtSecretManager); new Token<DelegationTokenIdentifier>(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 = final String fs_addr =
SecurityUtil.buildDTServiceName(uri, NameNode.DEFAULT_PORT); SecurityUtil.buildDTServiceName(uri, NameNode.DEFAULT_PORT);
t.setService(new Text(fs_addr)); t.setService(new Text(fs_addr));