svn commit: r726075 [2/2] - in /hadoop/core/trunk: ./ conf/ src/c++/libhdfs/tests/conf/ src/contrib/test/ src/core/ src/core/org/apache/hadoop/conf/ src/core/org/apache/hadoop/fs/ src/hdfs/ src/hdfs/org/apache/hadoop/hdfs/ src/hdfs/org/apache/hadoop/hd...

[ddas]

Modified: 
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDFSShellGenericOptions.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDFSShellGenericOptions.java?rev=726075&r1=726074&r2=726075&view=diff
==============================================================================
--- 
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDFSShellGenericOptions.java
 (original)
+++ 
hadoop/core/trunk/src/test/org/apache/hadoop/hdfs/TestDFSShellGenericOptions.java
 Fri Dec 12 09:28:55 2008
@@ -60,10 +60,10 @@
   }
     
   private void testConfOption(String[] args, String namenode) {
-    // prepare configuration hadoop-site.xml
+    // prepare configuration hdfs-site.xml
     File configDir = new File(new File("build", "test"), "minidfs");
     assertTrue(configDir.mkdirs());
-    File siteFile = new File(configDir, "hadoop-site.xml");
+    File siteFile = new File(configDir, "hdfs-site.xml");
     PrintWriter pw;
     try {
       pw = new PrintWriter(siteFile);

Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/MiniMRCluster.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/MiniMRCluster.java?rev=726075&r1=726074&r2=726075&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/MiniMRCluster.java 
(original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/MiniMRCluster.java Fri 
Dec 12 09:28:55 2008
@@ -606,7 +606,7 @@
       stopJobTracker();
     } finally {
       File configDir = new File("build", "minimr");
-      File siteFile = new File(configDir, "hadoop-site.xml");
+      File siteFile = new File(configDir, "mapred-site.xml");
       siteFile.delete();
     }
   }