Repository: hadoop Updated Branches: refs/heads/branch-2.8 811ab1bf9 -> 83985eed2
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/83985eed Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/83985eed Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/83985eed Branch: refs/heads/branch-2.8 Commit: 83985eed2a1b29e107f2a0b9fd46519c19f0d324 Parents: 811ab1b Author: Jason Lowe <jl...@apache.org> Authored: Wed Feb 10 16:44:12 2016 +0000 Committer: Jason Lowe <jl...@apache.org> Committed: Wed Feb 10 16:46:58 2016 +0000 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 6 ++++++ .../java/org/apache/hadoop/mapred/TestJavaSerialization.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/83985eed/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 2733db7..a2d1a45 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -445,6 +445,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 @@ -732,6 +735,9 @@ Release 2.6.5 - 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.6.4 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/83985eed/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);