MAPREDUCE-6123. TestCombineFileInputFormat incorrectly starts 2 MiniDFSCluster instances. Contributed by Chris Nauroth.

(cherry picked from commit 777877d079ecb025c293deac741800800e413179)
(cherry picked from commit f6278cbac50522302ee7ad3cbbe21d0aeefa76d8)

hadoop-mapreduce-project/CHANGES.txt

@@ -186,6 +186,9 @@ Release 2.6.0 - UNRELEASED
     MAPREDUCE-6122. TestLineRecordReader may fail due to test data files checked
     out of git with incorrect line endings. (cnauroth)
 
+    MAPREDUCE-6123. TestCombineFileInputFormat incorrectly starts 2
+    MiniDFSCluster instances. (cnauroth)
+
 Release 2.5.1 - 2014-09-05
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java

@@ -1286,10 +1286,6 @@ public class TestCombineFileInputFormat extends TestCase {
           .build();
       dfs.waitActive();
 
-      dfs = new MiniDFSCluster.Builder(conf).racks(rack1).hosts(hosts1)
-          .build();
-      dfs.waitActive();
-
       FileSystem fileSys = dfs.getFileSystem();
 
       // Set up the following directory structure: