svn commit: r1346409 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: CHANGES.txt src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCache.java src/test/system/ src/test/system/test/

[bobby]

Author: bobby
Date: Tue Jun  5 15:09:56 2012
New Revision: 1346409

URL: http://svn.apache.org/viewvc?rev=1346409&view=rev
Log:
svn merge -c 1346406. FIXES: MAPREDUCE-4313. TestTokenCache doesn't compile due 
TokenCache.getDelegationToken compilation error (bobby)

Added:
    hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/system/
      - copied from r1346406, 
hadoop/common/trunk/hadoop-mapreduce-project/src/test/system/
    
hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/system/test/
      - copied from r1346406, 
hadoop/common/trunk/hadoop-mapreduce-project/src/test/system/test/
Modified:
    hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
    
hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCache.java

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1346409&r1=1346408&r2=1346409&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue 
Jun  5 15:09:56 2012
@@ -42,6 +42,9 @@ Release 2.0.1-alpha - UNRELEASED
     MAPREDUCE-4307. TeraInputFormat calls FileSystem.getDefaultBlockSize()
     without a Path - Failure when using ViewFileSystem. (Ahmed Radwan via eli)
 
+    MAPREDUCE-4313. TestTokenCache doesn't compile due 
+    TokenCache.getDelegationToken compilation error (bobby)
+
 Release 2.0.0-alpha - 05-23-2012
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCache.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCache.java?rev=1346409&r1=1346408&r2=1346409&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCache.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCache.java
 Tue Jun  5 15:09:56 2012
@@ -288,7 +288,7 @@ public class TestTokenCache {
     // this token is keyed by hostname:port key.
     String fs_addr = 
       SecurityUtil.buildDTServiceName(p1.toUri(), NameNode.DEFAULT_PORT);
-    Token<DelegationTokenIdentifier> nnt = TokenCache.getDelegationToken(
+    Token<DelegationTokenIdentifier> nnt = 
(Token<DelegationTokenIdentifier>)TokenCache.getDelegationToken(
         credentials, fs_addr);
     System.out.println("dt for " + p1 + "(" + fs_addr + ")" + " = " +  nnt);
     assertNotNull("Token for nn is null", nnt);