Author: jing9
Date: Thu Nov 14 01:17:22 2013
New Revision: 1541778

URL: http://svn.apache.org/r1541778
Log:
HDFS-5487. Merge change r1541776 from trunk.

Added:
    
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestTokenAspect.java
      - copied unchanged from r1541776, 
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestTokenAspect.java
Modified:
    hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1541778&r1=1541777&r2=1541778&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
Thu Nov 14 01:17:22 2013
@@ -112,6 +112,8 @@ Release 2.3.0 - UNRELEASED
     HDFS-5440. Extract the logic of handling delegation tokens in 
HftpFileSystem 
     to the TokenAspect class. (Haohui Mai via jing9)
 
+    HDFS-5487. Introduce unit test for TokenAspect. (Haohui Mai via jing9)
+
   OPTIMIZATIONS
 
     HDFS-5239.  Allow FSNamesystem lock fairness to be configurable (daryn)


Reply via email to