Repository: hadoop Updated Branches: refs/heads/branch-2.6 eb5faa161 -> 034fcaa54
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/034fcaa5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/034fcaa5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/034fcaa5 Branch: refs/heads/branch-2.6 Commit: 034fcaa540acb4dc60a748398e4a58a7c45b8660 Parents: eb5faa1 Author: Jason Lowe <[email protected]> Authored: Mon Oct 13 16:04:14 2014 +0000 Committer: Jason Lowe <[email protected]> Committed: Mon Oct 13 16:06:28 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/034fcaa5/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index f6829f4..0134c06 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -192,6 +192,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/034fcaa5/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(
