hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jl...@apache.org
Subject git commit: MAPREDUCE-6115. TestPipeApplication#testSubmitter fails in trunk. Contributed by Binglin Chang (cherry picked from commit 793dbf2465c01426a93bb26d08e377ffd3915340)
Date Mon, 13 Oct 2014 16:06:19 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 9ed9ea8c5 -> 942fb67a0


MAPREDUCE-6115. TestPipeApplication#testSubmitter fails in trunk. Contributed by Binglin Chang
(cherry picked from commit 793dbf2465c01426a93bb26d08e377ffd3915340)


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

Branch: refs/heads/branch-2
Commit: 942fb67a042901e4b326a7a1ea751ef41b5e3c0a
Parents: 9ed9ea8
Author: Jason Lowe <jlowe@apache.org>
Authored: Mon Oct 13 16:04:14 2014 +0000
Committer: Jason Lowe <jlowe@apache.org>
Committed: Mon Oct 13 16:05:29 2014 +0000

----------------------------------------------------------------------
 hadoop-mapreduce-project/CHANGES.txt                              | 3 +++
 .../java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/942fb67a/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index d294246..a84acbf 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -207,6 +207,9 @@ Release 2.6.0 - UNRELEASED
     MAPREDUCE-6125. TestContainerLauncherImpl sometimes fails (Mit Desai via
     jlowe)
 
+    MAPREDUCE-6115. TestPipeApplication#testSubmitter fails in trunk (Binglin
+    Chang via jlowe)
+
 Release 2.5.1 - 2014-09-05
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/942fb67a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java
index c2a990e..093388a 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java
@@ -308,7 +308,7 @@ public class TestPipeApplication {
       assertTrue(out.toString().contains(
               "-fs <local|namenode:port>      specify a namenode"));
       assertTrue(out.toString().contains(
-              "-jt <local|ResourceManager:port>    specify a ResourceManager"));
+              "-jt <local|resourcemanager:port>    specify a ResourceManager"));
       assertTrue(out
               .toString()
               .contains(


Mime
View raw message