Author: tucu
Date: Sat Jan 28 00:28:37 2012
New Revision: 1236942
URL: http://svn.apache.org/viewvc?rev=1236942&view=rev
Log:
Merge -r 1236939:1236940 from trunk to branch. FIXES: HDFS-2840
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/servlet/TestHostnameFilter.java
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/servlet/TestHostnameFilter.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/servlet/TestHostnameFilter.java?rev=1236942&r1=1236941&r2=1236942&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/servlet/TestHostnameFilter.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/servlet/TestHostnameFilter.java
Sat Jan 28 00:28:37 2012
@@ -47,7 +47,7 @@ public class TestHostnameFilter extends
@Override
public void doFilter(ServletRequest servletRequest, ServletResponse
servletResponse)
throws IOException, ServletException {
- Assert.assertEquals(HostnameFilter.get(), "localhost");
+ Assert.assertTrue(HostnameFilter.get().contains("localhost"));
invoked.set(true);
}
};
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1236942&r1=1236941&r2=1236942&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Sat Jan 28 00:28:37 2012
@@ -188,6 +188,8 @@ Release 0.23.1 - UNRELEASED
HDFS-2837. mvn javadoc:javadoc not seeing LimitedPrivate class (revans2
via tucu)
+ HDFS-2840. TestHostnameFilter should work with localhost or
localhost.localdomain (tucu)
+
Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES
