Merge -r 678522:678523 from trunk to fix HADOOP-3798.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.18@678524 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -765,6 +765,8 @@ Release 0.18.0 - Unreleased
     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

src/test/org/apache/hadoop/mapred/TestJobShell.java

@@ -24,7 +24,7 @@ import junit.framework.TestCase;
 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..