Merge branch 'develop' into feature/SLIDER_187_start_stop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/531b7582 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/531b7582 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/531b7582 Branch: refs/heads/feature/SLIDER_187_start_stop Commit: 531b7582eea22fa5cd6dec04a111e2f88bf98460 Parents: 0350273 329cab0 Author: Sumit Mohanty <[email protected]> Authored: Fri Aug 29 11:52:39 2014 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Fri Aug 29 11:52:39 2014 -0700 ---------------------------------------------------------------------- .../src/test/python/agent/TestRegistration.py | 14 +---------- slider-agent/src/test/python/unitTests.py | 1 + slider-assembly/src/main/scripts/slider.py | 6 ++--- .../agent/TestAgentAMManagementWS.groovy | 8 +++--- .../slider/providers/agent/TestAgentEcho.groovy | 6 ++--- .../curator/TestRegistryRestResources.groovy | 6 ++--- .../publisher/TestPublisherRestResources.groovy | 26 +++++++++----------- .../apache/slider/test/SliderTestUtils.groovy | 9 +++++++ .../slider/test/YarnMiniClusterTestBase.groovy | 7 +++++- .../workflow/ProcessCommandFactory.java | 21 +++++++++++----- .../services/workflow/TestLongLivedProcess.java | 6 ++--- .../workflow/WorkflowServiceTestBase.java | 3 ++- 12 files changed, 62 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/531b7582/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy ----------------------------------------------------------------------
