Author: tucu
Date: Thu Jul 26 13:43:17 2012
New Revision: 1365991
URL: http://svn.apache.org/viewvc?rev=1365991&view=rev
Log:
Merge -r 1365989:1365990 from trunk to branch. FIXES: HDFS-3113
Removed:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/TestHttpFSFileSystem.java.orig
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSServer.java.orig
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestJettyHelper.java.orig
