hadoop git commit: MAPREDUCE-6191. Improve clearing stale state of Java serialization testcase. (Sam Liu via Eric Yang) (cherry picked from commit c379e102ddab1b83fd69e4492a40c9901fb50675)

[jlowe]

Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 948dd2796 -> 9d574368b


MAPREDUCE-6191. Improve clearing stale state of Java serialization
                testcase.  (Sam Liu via Eric Yang)
(cherry picked from commit c379e102ddab1b83fd69e4492a40c9901fb50675)

Conflicts:

        hadoop-mapreduce-project/CHANGES.txt
(cherry picked from commit 303c650d0dfcb10760cea589b8cef6ace8e36417)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9d574368
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9d574368
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9d574368

Branch: refs/heads/branch-2.7
Commit: 9d574368b50bdc6d14b0489896392abbc54408b6
Parents: 948dd27
Author: Jason Lowe <jl...@apache.org>
Authored: Wed Feb 10 16:48:06 2016 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Wed Feb 10 16:48:06 2016 +0000

----------------------------------------------------------------------
 hadoop-mapreduce-project/CHANGES.txt                        | 9 +++++++++
 .../org/apache/hadoop/mapred/TestJavaSerialization.java     | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/9d574368/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index 45a9f83..0752de0 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -43,6 +43,9 @@ Release 2.7.3 - UNRELEASED
     MAPREDUCE-6413. TestLocalJobSubmission is failing with unknown host
     (zhihai xu via jlowe)
 
+    MAPREDUCE-6191. Improve clearing stale state of Java serialization
+                    testcase.  (Sam Liu via Eric Yang)
+
 Release 2.7.2 - 2016-01-25
 
   INCOMPATIBLE CHANGES
@@ -327,6 +330,12 @@ Release 2.6.5 - UNRELEASED
 
   BUG FIXES
 
+    MAPREDUCE-6413. TestLocalJobSubmission is failing with unknown host
+    (zhihai xu via jlowe)
+
+    MAPREDUCE-6191. Improve clearing stale state of Java serialization
+                    testcase.  (Sam Liu via Eric Yang)
+
 Release 2.6.4 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/9d574368/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java
----------------------------------------------------------------------
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java
index 4dea0d7..265118a 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java
@@ -81,7 +81,7 @@ public class TestJavaSerialization extends TestCase {
   }
 
   private void cleanAndCreateInput(FileSystem fs) throws IOException {
-    fs.delete(INPUT_FILE, true);
+    fs.delete(INPUT_DIR, true);
     fs.delete(OUTPUT_DIR, true);
 
     OutputStream os = fs.create(INPUT_FILE);