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/08/09 15:05:27 UTC
[46/50] [abbrv] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-slider into develop
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider 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/05bf45d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/05bf45d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/05bf45d1
Branch: refs/heads/feature/SLIDER-151_REST_API
Commit: 05bf45d179cd52ea0d9de79ffd1a84dec90958fd
Parents: 6f912df c215045
Author: tedyu <yu...@gmail.com>
Authored: Fri Aug 8 11:24:31 2014 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Fri Aug 8 11:24:31 2014 -0700
----------------------------------------------------------------------
.../apache/slider/common/tools/SliderUtils.java | 17 +-
.../providers/AbstractProviderService.java | 12 +-
.../slider/providers/ProviderService.java | 16 +-
.../providers/agent/AgentProviderService.java | 15 +-
.../providers/agent/HeartbeatMonitor.java | 9 +-
.../server/appmaster/AMViewForProviders.java | 46 -----
.../appmaster/ContainerStartOperation.java | 40 -----
.../server/appmaster/RoleLaunchService.java | 40 +++--
.../server/appmaster/SliderAppMaster.java | 134 ++++++++++----
.../server/appmaster/actions/ActionHalt.java | 41 +++++
.../appmaster/actions/ActionStartContainer.java | 47 +++++
.../appmaster/actions/ActionStopQueue.java | 36 ++++
.../appmaster/actions/ActionStopSlider.java | 39 ++++
.../server/appmaster/actions/AsyncAction.java | 124 +++++++++++++
.../actions/ProviderReportedContainerLoss.java | 47 +++++
.../actions/ProviderStartupCompleted.java | 37 ++++
.../server/appmaster/actions/QueueAccess.java | 35 ++++
.../server/appmaster/actions/QueueExecutor.java | 75 ++++++++
.../server/appmaster/actions/QueueService.java | 76 ++++++++
.../appmaster/actions/StartContainerAction.java | 41 +++++
.../AbstractWorkflowExecutorService.java | 110 ------------
.../services/workflow/ForkedProcessService.java | 6 +-
.../workflow/WorkflowCallbackService.java | 3 +-
.../workflow/WorkflowExecutorService.java | 113 ++++++++++++
.../WorkflowScheduledExecutorService.java | 38 ++++
.../server/services/workflow/package-info.java | 2 +-
.../standalone/TestDestroyStandaloneAM.groovy | 156 ----------------
.../standalone/TestKillStandaloneAM.groovy | 73 --------
.../standalone/TestRestartStandaloneAM.groovy | 96 ----------
.../standalone/TestStandaloneAMDestroy.groovy | 154 ++++++++++++++++
.../standalone/TestStandaloneAMKill.groovy | 73 ++++++++
.../standalone/TestStandaloneAMRestart.groovy | 96 ++++++++++
.../server/appmaster/actions/TestActions.groovy | 180 +++++++++++++++++++
.../model/history/TestRoleHistoryRW.groovy | 2 +-
.../model/mock/MockProviderService.groovy | 4 +-
.../providers/agent/TestHeartbeatMonitor.java | 6 -
.../publisher/TestAgentProviderService.java | 6 +-
.../workflow/TestWorkflowExecutorService.java | 9 +-
38 files changed, 1428 insertions(+), 626 deletions(-)
----------------------------------------------------------------------