Repository: hadoop Updated Branches: refs/heads/branch-2 e5a531a8a -> d5d9fd325
MAPREDUCE-6104. TestJobHistoryParsing.testPartialJob fails in branch-2. Contributed by Mit Desai (cherry picked from commit 7af4c3888bf7be0822dc880170e5e3d09e9280f1) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d5d9fd32 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d5d9fd32 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d5d9fd32 Branch: refs/heads/branch-2 Commit: d5d9fd32553aa09534f336b4976434a76126de0a Parents: e5a531a Author: Jason Lowe <jl...@apache.org> Authored: Wed Sep 24 16:09:33 2014 +0000 Committer: Jason Lowe <jl...@apache.org> Committed: Wed Sep 24 16:10:28 2014 +0000 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryParsing.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d5d9fd32/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 952295a..d163417 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -150,6 +150,9 @@ Release 2.6.0 - UNRELEASED MAPREDUCE-6095. Enable DistributedCache for uber-mode Jobs (Gera Shegalov via jlowe) + MAPREDUCE-6104. TestJobHistoryParsing.testPartialJob fails in branch-2 + (Mit Desai via jlowe) + Release 2.5.1 - 2014-09-05 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/d5d9fd32/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryParsing.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryParsing.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryParsing.java index c2246b3..93538dc 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryParsing.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobHistoryParsing.java @@ -806,7 +806,7 @@ public class TestJobHistoryParsing { /** * Simple test PartialJob */ - @Test(timeout = 1000) + @Test(timeout = 3000) public void testPartialJob() throws Exception { JobId jobId = new JobIdPBImpl(); jobId.setId(0);
