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 ka...@apache.org on 2014/11/21 00:13:51 UTC

hadoop git commit: MAPREDUCE-6170. TestUlimit failure on JDK8. (bc Wong via kasha)

Repository: hadoop
Updated Branches:
  refs/heads/branch-1 ebec913e2 -> 2dff54ebc


MAPREDUCE-6170. TestUlimit failure on JDK8. (bc Wong via kasha)


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

Branch: refs/heads/branch-1
Commit: 2dff54ebc8a3a541209c333dbdbbafe82b02e6e9
Parents: ebec913
Author: Karthik Kambatla <ka...@cloudera.com>
Authored: Thu Nov 20 15:13:39 2014 -0800
Committer: Karthik Kambatla <ka...@cloudera.com>
Committed: Thu Nov 20 15:13:39 2014 -0800

----------------------------------------------------------------------
 CHANGES.txt                                                        | 2 ++
 .../streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/2dff54eb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a695be2..0bc2773 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -254,6 +254,8 @@ Release 1.3.0 - unreleased
     MAPREDUCE-6088. TestTokenCache tests should use their own JobConf 
     instances. (Zhihai Xu via kasha)
 
+    MAPREDUCE-6170. TestUlimit failure on JDK8. (bc Wong via kasha)
+
 Release 1.2.2 - unreleased
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/2dff54eb/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java
----------------------------------------------------------------------
diff --git a/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java b/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java
index e34a685..30205fa 100644
--- a/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java
+++ b/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java
@@ -46,7 +46,7 @@ public class TestUlimit extends TestCase {
   MiniDFSCluster dfs = null;
   MiniMRCluster mr = null;
   FileSystem fs = null;
-  private static String SET_MEMORY_LIMIT = "1786432"; // 1768MB
+  private static String SET_MEMORY_LIMIT = "3145728"; // 3GB
 
   String[] genArgs(String memLimit) {
     return new String[] {