You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/11/11 16:05:12 UTC
[09/17] incubator-slider git commit: Merge branch
'feature/SLIDER-622-windows' into develop
Merge branch 'feature/SLIDER-622-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/36e5d435
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/36e5d435
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/36e5d435
Branch: refs/heads/develop
Commit: 36e5d435196fb6068bf00acb01fd52d1dd7c0fa5
Parents: 56bc48d eba57bb
Author: Steve Loughran <st...@apache.org>
Authored: Tue Nov 11 15:02:23 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Nov 11 15:02:23 2014 +0000
----------------------------------------------------------------------
.../org/apache/slider/client/SliderClient.java | 12 ++--
.../slider/core/build/InstanceBuilder.java | 4 +-
.../apache/slider/core/zk/ZKIntegration.java | 18 +++++-
.../standalone/TestStandaloneAMDestroy.groovy | 5 ++
.../common/tools/TestZKIntegration.groovy | 45 ++++++++------
.../providers/agent/TestBuildBasicAgent.groovy | 2 +-
.../slider/test/YarnMiniClusterTestBase.groovy | 65 +++++++++++++++++---
7 files changed, 114 insertions(+), 37 deletions(-)
----------------------------------------------------------------------