Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -c 1379623 FIXES: HDFS-3852. TestHftpDelegationToken is broken after HADOOP-8225 (daryn) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379626 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Daryn Sharp 2012-08-31 21:33:17 +00:00
parent a64a30ce6c
commit dbe5edbfaa
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -1451,6 +1451,8 @@ Release 0.23.3 - UNRELEASED
HDFS-3873. Hftp assumes security is disabled if token fetch fails (daryn) HDFS-3873. Hftp assumes security is disabled if token fetch fails (daryn)
HDFS-3852. TestHftpDelegationToken is broken after HADOOP-8225 (daryn)
Release 0.23.2 - UNRELEASED Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHftpDelegationToken.java
View File

@ -53,7 +53,7 @@ public class TestHftpDelegationToken {
new Text("127.0.0.1:8020")); new Text("127.0.0.1:8020"));
user.addToken(token); user.addToken(token);
Token<?> token2 = new Token<TokenIdentifier> Token<?> token2 = new Token<TokenIdentifier>
(null, null, new Text("other token"), new Text("127.0.0.1:8020")); (null, null, new Text("other token"), new Text("127.0.0.1:8021"));
user.addToken(token2); user.addToken(token2);
assertEquals("wrong tokens in user", 2, user.getTokens().size()); assertEquals("wrong tokens in user", 2, user.getTokens().size());
FileSystem fs = FileSystem fs =