Merge branch 'feature/SLIDER-622-jenkins-windows' 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/db16e03d Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/db16e03d Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/db16e03d Branch: refs/heads/develop Commit: db16e03d445e9583d0811e9b87ca6ef67b5dd900 Parents: e74e7fe 6c7d59f Author: Steve Loughran <[email protected]> Authored: Sat Nov 8 21:56:06 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Sat Nov 8 21:56:06 2014 +0000 ---------------------------------------------------------------------- .../standalone/TestStandaloneAgentAM.groovy | 50 +++++++++----------- .../agent/TestAgentAMManagementWS.groovy | 4 +- .../appmaster/TestDelayInContainerLaunch.groovy | 15 +++--- .../apache/slider/test/SliderTestBase.groovy | 5 +- .../apache/slider/test/SliderTestUtils.groovy | 3 +- 5 files changed, 33 insertions(+), 44 deletions(-) ----------------------------------------------------------------------
