Merge branch 'hadoop2.5/SLIDER-34_AM_Restart_not_working' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/4612ccb4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4612ccb4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4612ccb4 Branch: refs/heads/develop Commit: 4612ccb48a9ffb2096420a1407ea041ccbbcc3bd Parents: d3e4bf2 cdbed7d Author: Steve Loughran <ste...@apache.org> Authored: Tue Aug 26 09:05:24 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Tue Aug 26 09:05:24 2014 +0100 ---------------------------------------------------------------------- .../providers/hbase/minicluster/failures/TestKilledHBaseAM.groovy | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4612ccb4/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledHBaseAM.groovy ---------------------------------------------------------------------- diff --cc slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledHBaseAM.groovy index d219636,2c1ff57..6d3a12b --- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledHBaseAM.groovy +++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledHBaseAM.groovy @@@ -47,8 -47,8 +47,7 @@@ class TestKilledHBaseAM extends HBaseMi @Test public void testKilledHBaseAM() throws Throwable { - skip("SLIDER-66: AM Restart Failing -YARN issues") - String clustername = "test_killed_hbase_am" int regionServerCount = 1
