Merge branch 'feature/SLIDER-623-python' 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/c806be2c Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/c806be2c Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/c806be2c Branch: refs/heads/develop Commit: c806be2c516fa821e92ef13ec0389093ce7bb039 Parents: 1890c42 5898afd Author: Steve Loughran <[email protected]> Authored: Mon Nov 10 00:09:18 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Mon Nov 10 00:09:18 2014 +0000 ---------------------------------------------------------------------- .../apache/slider/common/SliderXmlConfKeys.java | 7 +++ .../apache/slider/common/tools/SliderUtils.java | 64 ++++++++++++++------ .../server/appmaster/SliderAppMaster.java | 7 ++- .../tools/TestExecutionEnvironment.groovy | 18 +++++- .../common/tools/TestWindowsSupport.groovy | 2 +- .../slider/providers/agent/AgentTestBase.groovy | 10 +-- .../slider/providers/agent/TestAgentEcho.groovy | 5 ++ .../apache/slider/test/SliderTestUtils.groovy | 32 +++------- .../slider/test/YarnMiniClusterTestBase.groovy | 6 +- .../services/workflow/TestLongLivedProcess.java | 3 + .../TestWorkflowForkedProcessService.java | 4 +- 11 files changed, 101 insertions(+), 57 deletions(-) ----------------------------------------------------------------------
