Repository: hadoop Updated Branches: refs/heads/branch-2 d732c7b9d -> 43f051a09
YARN-4145. Make RMHATestBase abstract so its not run when running all tests under that namespace (adhoot via rkanter) (cherry picked from commit ea4bb2749f966a5eaf712d1dbb2c845df0f5ca67) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/43f051a0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/43f051a0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/43f051a0 Branch: refs/heads/branch-2 Commit: 43f051a09af24ca967540b59c742ddd167f868fc Parents: d07eef8 Author: Robert Kanter <[email protected]> Authored: Fri Sep 11 11:42:50 2015 -0700 Committer: Robert Kanter <[email protected]> Committed: Fri Sep 11 11:46:35 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../apache/hadoop/yarn/server/resourcemanager/RMHATestBase.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/43f051a0/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 1ad6570..d67ef2a 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -375,6 +375,9 @@ Release 2.8.0 - UNRELEASED YARN-4086. Allow Aggregated Log readers to handle HAR files (rkanter) + YARN-4145. Make RMHATestBase abstract so its not run when running all + tests under that namespace (adhoot via rkanter) + OPTIMIZATIONS YARN-3339. TestDockerContainerExecutor should pull a single image and not http://git-wip-us.apache.org/repos/asf/hadoop/blob/43f051a0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/RMHATestBase.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/RMHATestBase.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/RMHATestBase.java index 6f3666f..40b59ba 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/RMHATestBase.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/RMHATestBase.java @@ -45,7 +45,7 @@ import org.junit.Assert; import org.junit.Before; -public class RMHATestBase extends ClientBaseWithFixes{ +public abstract class RMHATestBase extends ClientBaseWithFixes{ private static final int ZK_TIMEOUT_MS = 5000; private static StateChangeRequestInfo requestInfo =
