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 ju...@apache.org on 2016/04/13 18:02:59 UTC
[1/2] hadoop git commit: MAPREDUCE-6670. TestJobListCache#testEviction sometimes fails on Windows with timeout. Contributed by Gergely Novák. (cherry picked from commit de96d7c88a42cd54bd88ce2de63122998e967efa) (cherry picked from commit 5574f827991cfc3d
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 2ee244ac2 -> b4d24d7b0
MAPREDUCE-6670. TestJobListCache#testEviction sometimes fails on Windows with timeout. Contributed by Gergely Novák.
(cherry picked from commit de96d7c88a42cd54bd88ce2de63122998e967efa)
(cherry picked from commit 5574f827991cfc3d14f71184296866d387ed174f)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/683f313c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/683f313c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/683f313c
Branch: refs/heads/branch-2.7
Commit: 683f313c1f14e3455b39df32b5444fde6eff94d2
Parents: 2ee244a
Author: Junping Du <ju...@apache.org>
Authored: Wed Apr 6 08:32:35 2016 -0700
Committer: Junping Du <ju...@apache.org>
Committed: Wed Apr 13 08:59:22 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/mapreduce/v2/hs/TestJobListCache.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/683f313c/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobListCache.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobListCache.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobListCache.java
index 6ebbb7c..3ccc222 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobListCache.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestJobListCache.java
@@ -45,7 +45,7 @@ public class TestJobListCache {
cache.values().size());
}
- @Test (timeout = 1000)
+ @Test (timeout = 5000)
public void testEviction() throws InterruptedException {
int maxSize = 2;
JobListCache cache = new JobListCache(maxSize, 1000);
[2/2] hadoop git commit: Add entry of MAPREDUCE-6670 to CHANGES.txt
after backport.
Posted by ju...@apache.org.
Add entry of MAPREDUCE-6670 to CHANGES.txt after backport.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b4d24d7b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b4d24d7b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b4d24d7b
Branch: refs/heads/branch-2.7
Commit: b4d24d7b0e57bb204b09f7567408525bf7140bbc
Parents: 683f313
Author: Junping Du <ju...@apache.org>
Authored: Wed Apr 13 09:02:33 2016 -0700
Committer: Junping Du <ju...@apache.org>
Committed: Wed Apr 13 09:02:33 2016 -0700
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b4d24d7b/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 651c0b3..2ad4659 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -67,6 +67,9 @@ Release 2.7.3 - UNRELEASED
MAPREDUCE-6302. Preempt reducers after a configurable timeout
irrespective of headroom. (kasha via wangda)
+ MAPREDUCE-6670. TestJobListCache#testEviction sometimes fails on Windows
+ with timeout. (Gergely Novák via junping_du)
+
Release 2.7.2 - 2016-01-25
INCOMPATIBLE CHANGES