svn merge -c 1306901 from trunk to branch-2 FIXES: MAPREDUCE-4081. TestMROutputFormat.java does not compile (Jason Lowe via bobby)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306905 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -89,6 +89,9 @@ Release 2.0.0 - UNRELEASED
     MAPREDUCE-3377. Added a unit test to ensure OutputCommitter.checkOutputSpecs 
     is called prior to copying job.xml. (Jane Chen via acmurthy) 
 
+    MAPREDUCE-4081. TestMROutputFormat.java does not compile (Jason Lowe via
+    bobby)
+
 Release 0.23.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMROutputFormat.java

@@ -33,7 +33,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
 
-public class TestConfInCheckSpec {
+public class TestMROutputFormat {
 
   @Test
   public void testJobSubmission() throws Exception {