You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by su...@apache.org on 2014/09/24 23:13:06 UTC
[15/35] git commit: MAPREDUCE-6104.
TestJobHistoryParsing.testPartialJob fails in branch-2. Contributed by Mit
Desai
MAPREDUCE-6104. TestJobHistoryParsing.testPartialJob fails in branch-2. Contributed by Mit Desai
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7af4c388
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7af4c388
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7af4c388
Branch: refs/heads/YARN-1051
Commit: 7af4c3888bf7be0822dc880170e5e3d09e9280f1
Parents: 034df0e
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:09:33 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/7af4c388/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 859c899..a71e3ef 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -367,6 +367,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/7af4c388/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 d2f5e70..fe5706a 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
@@ -810,7 +810,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);