Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider 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/050e001e Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/050e001e Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/050e001e Branch: refs/heads/develop Commit: 050e001e79d3194b5f138facbc54a93d1e4cd3b9 Parents: 693fddd fc140b5 Author: tedyu <[email protected]> Authored: Mon Nov 10 15:32:21 2014 -0800 Committer: tedyu <[email protected]> Committed: Mon Nov 10 15:32:21 2014 -0800 ---------------------------------------------------------------------- pom.xml | 36 +++++- slider-core/pom.xml | 8 +- .../apache/slider/common/tools/SliderUtils.java | 10 +- .../services/utility/EndOfServiceWaiter.java | 13 +- .../services/workflow/ForkedProcessService.java | 2 +- .../standalone/TestStandaloneAMDestroy.groovy | 4 + .../standalone/TestStandaloneAMKill.groovy | 4 +- .../standalone/TestStandaloneAgentAM.groovy | 1 + .../common/tools/TestWindowsSupport.groovy | 125 +++++++++++++------ .../common/tools/TestZKIntegration.groovy | 4 +- .../server/appmaster/actions/TestActions.groovy | 2 +- .../apache/slider/test/SliderTestUtils.groovy | 88 +++++++------ .../slider/test/YarnMiniClusterTestBase.groovy | 59 ++++++++- .../test/YarnZKMiniClusterTestBase.groovy | 2 +- .../services/workflow/TestLongLivedProcess.java | 2 - .../TestWorkflowForkedProcessService.java | 23 ++-- .../providers/accumulo/AccumuloTestBase.groovy | 2 +- .../accumulo/live/TestAccFreezeThaw.groovy | 4 +- 18 files changed, 272 insertions(+), 117 deletions(-) ----------------------------------------------------------------------
