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/10/06 02:32:11 UTC
[5/5] git commit: Merge branch 'feature/SLIDER-467_FinalStatus' into
develop
Merge branch 'feature/SLIDER-467_FinalStatus' 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/70b4b759
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/70b4b759
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/70b4b759
Branch: refs/heads/develop
Commit: 70b4b75927bdf56184bb6d6a8e2bb5fafbf4c50c
Parents: 1893c7c a3944b1
Author: Steve Loughran <st...@apache.org>
Authored: Sun Oct 5 17:31:53 2014 -0700
Committer: Steve Loughran <st...@apache.org>
Committed: Sun Oct 5 17:31:53 2014 -0700
----------------------------------------------------------------------
.../org/apache/slider/client/SliderClient.java | 24 +-
.../slider/core/exceptions/SliderException.java | 6 +-
.../TriggerClusterTeardownException.java | 16 +-
.../providers/AbstractProviderService.java | 21 +-
.../apache/slider/providers/ProviderUtils.java | 6 +-
.../providers/agent/AgentProviderService.java | 22 --
.../slideram/SliderAMProviderService.java | 8 -
.../apache/slider/server/appmaster/AMUtils.java | 5 +-
.../server/appmaster/SliderAppMaster.java | 249 +++++++++++--------
.../appmaster/actions/ActionStopSlider.java | 116 ++++++++-
.../server/appmaster/actions/QueueExecutor.java | 8 +
.../server/appmaster/actions/QueueService.java | 22 +-
.../slider/server/appmaster/state/AppState.java | 8 +-
.../workflow/WorkflowSequenceService.java | 8 +-
.../agent/actions/TestActionStatus.groovy | 16 +-
.../TestFreezeThawFlexStandaloneAM.groovy | 13 +-
.../standalone/TestStandaloneAMDestroy.groovy | 20 +-
.../standalone/TestStandaloneAMRestart.groovy | 77 ++++--
.../TestMockAppStateContainerFailure.groovy | 1 -
.../slider/test/YarnMiniClusterTestBase.groovy | 37 ++-
.../accumulo/live/TestAccFreezeThaw.groovy | 7 +-
.../providers/hbase/HBaseProviderService.java | 23 --
22 files changed, 479 insertions(+), 234 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/70b4b759/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------