Author: omalley
Date: Mon Jul 21 11:39:30 2008
New Revision: 678524
URL: http://svn.apache.org/viewvc?rev=678524&view=rev
Log:
Merge -r 678522:678523 from trunk to fix HADOOP-3798.
Modified:
hadoop/core/branches/branch-0.18/CHANGES.txt
hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/mapred/TestJobShell.java
Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=678524&r1=678523&r2=678524&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Mon Jul 21 11:39:30 2008
@@ -765,6 +765,8 @@
HADOOP-3774. Fix typos in shell output. (Tsz Wo (Nicholas), SZE via
cdouglas)
+ HADOOP-3798. Fix tests compilation. (Mukund Madhugiri via omalley)
+
Release 0.17.2 - Unreleased
BUG FIXES
Modified:
hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/mapred/TestJobShell.java
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/mapred/TestJobShell.java?rev=678524&r1=678523&r2=678524&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/mapred/TestJobShell.java
(original)
+++
hadoop/core/branches/branch-0.18/src/test/org/apache/hadoop/mapred/TestJobShell.java
Mon Jul 21 11:39:30 2008
@@ -24,7 +24,7 @@
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.*;
import org.apache.hadoop.util.ToolRunner;
-import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.dfs.MiniDFSCluster;
public class TestJobShell extends TestCase {
// Input output paths for this..
