Author: omalley
Date: Wed Feb 20 10:27:35 2008
New Revision: 629563

URL: http://svn.apache.org/viewvc?rev=629563&view=rev
Log:
Merge -r 629559:629560 from trunk to branch 0.16 to fix HADOOP-2769.

Modified:
    hadoop/core/branches/branch-0.16/CHANGES.txt
    
hadoop/core/branches/branch-0.16/src/test/org/apache/hadoop/dfs/TestNNThroughputBenchmark.java

Modified: hadoop/core/branches/branch-0.16/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.16/CHANGES.txt?rev=629563&r1=629562&r2=629563&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.16/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.16/CHANGES.txt Wed Feb 20 10:27:35 2008
@@ -1,6 +1,6 @@
 Hadoop Change Log
 
-Release 0.16.1 - Unrelease
+Release 0.16.1 - Unreleased
 
   IMPROVEMENTS
 
@@ -69,6 +69,9 @@
 
     HADOOP-2766. Enables setting of HADOOP_OPTS env variable for the hadoop
     daemons through HOD. (Vinod Kumar Vavilapalli via ddas)
+
+    HADOOP-2769.  TestNNThroughputBnechmark should not use a fixed port for
+    the namenode http port. (omalley)
 
 Release 0.16.0 - 2008-02-07
 

Modified: 
hadoop/core/branches/branch-0.16/src/test/org/apache/hadoop/dfs/TestNNThroughputBenchmark.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.16/src/test/org/apache/hadoop/dfs/TestNNThroughputBenchmark.java?rev=629563&r1=629562&r2=629563&view=diff
==============================================================================
--- 
hadoop/core/branches/branch-0.16/src/test/org/apache/hadoop/dfs/TestNNThroughputBenchmark.java
 (original)
+++ 
hadoop/core/branches/branch-0.16/src/test/org/apache/hadoop/dfs/TestNNThroughputBenchmark.java
 Wed Feb 20 10:27:35 2008
@@ -28,6 +28,7 @@
   public void testNNThroughput() throws Exception {
     Configuration conf = new Configuration();
     conf.set("fs.default.name", "localhost:" + 0);
+    conf.set("dfs.http.address", "0.0.0.0:0");
     NameNode.format(conf);
     NNThroughputBenchmark.runBenchmark(conf, new String[] {"-op", "all"});
   }


Reply via email to