Merge branch 'feature/SLIDER-863-windows-tests' 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/0f04fc5e Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0f04fc5e Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0f04fc5e Branch: refs/heads/develop Commit: 0f04fc5ee12b230836f630f23c416541832d6574 Parents: 9cb5848 1f80099 Author: Steve Loughran <ste...@apache.org> Authored: Wed Apr 29 17:28:29 2015 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Wed Apr 29 17:28:29 2015 +0100 ---------------------------------------------------------------------- .../org/apache/slider/client/SliderClient.java | 173 ++++++++++++------- .../providers/agent/AgentClientProvider.java | 14 +- .../providers/agent/AgentProviderService.java | 5 +- .../agent/AgentMiniClusterTestBase.groovy | 11 +- .../agent/actions/TestActionPackage.groovy | 59 +++++-- .../client/TestPackageCommandOptions.groovy | 59 +++---- .../client/TestUpgradeCommandOptions.groovy | 146 ++++++++-------- .../apache/slider/test/SliderTestUtils.groovy | 4 +- .../agent/TestAgentClientProvider2.java | 50 +++--- 9 files changed, 300 insertions(+), 221 deletions(-) ----------------------------------------------------------------------
