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/06/03 17:30:50 UTC
[6/6] git commit: Merge branch
'feature/SLIDER-94_Get_YARN_utility_features_into_yarn-common' into develop
Merge branch 'feature/SLIDER-94_Get_YARN_utility_features_into_yarn-common' 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/d81da56a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/d81da56a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/d81da56a
Branch: refs/heads/develop
Commit: d81da56a104472d3cf9b9fca238a05096f1bd666
Parents: 5ff1aa7 12cf183
Author: Steve Loughran <st...@apache.org>
Authored: Tue Jun 3 16:27:17 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Jun 3 16:27:17 2014 +0100
----------------------------------------------------------------------
.../apache/slider/common/tools/Duration.java | 67 ++++++--
.../slider/core/main/ServiceLauncher.java | 17 +-
.../providers/AbstractProviderService.java | 2 +-
.../slider/providers/ProviderCompleted.java | 29 ++++
.../providers/ProviderCompletedCallable.java | 38 +++++
.../slider/providers/ProviderService.java | 3 +-
.../providers/agent/AgentProviderService.java | 4 +-
.../slideram/SliderAMProviderService.java | 4 +-
.../server/appmaster/SliderAppMaster.java | 14 +-
.../services/workflow/ForkedProcessService.java | 1 +
.../workflow/ServiceTerminatingCallable.java | 11 +-
.../workflow/WorkflowCallbackService.java | 24 ++-
.../workflow/WorkflowEventCallback.java | 31 ----
.../workflow/WorkflowEventNotifyingService.java | 114 -------------
.../server/services/workflow/package-info.java | 158 +++++++++++--------
.../model/mock/MockProviderService.groovy | 4 +-
.../apache/slider/test/SliderTestUtils.groovy | 8 +-
.../workflow/TestForkedProcessService.java | 140 ----------------
.../TestServiceTerminatingRunnable.java | 64 --------
.../workflow/TestWorkflowCompositeService.java | 22 +--
.../TestWorkflowForkedProcessService.java | 140 ++++++++++++++++
.../workflow/TestWorkflowSequenceService.java | 24 +--
.../TestWorkflowServiceTerminatingRunnable.java | 64 ++++++++
.../workflow/WorkflowServiceTestBase.java | 17 --
.../accumulo/AccumuloProviderService.java | 25 +--
.../providers/accumulo/AccumuloTestBase.groovy | 98 +++++++-----
.../live/TestAccCorrectInstanceName.groovy | 2 +-
.../accumulo/live/TestAccFreezeThaw.groovy | 4 +-
.../accumulo/live/TestAccLiveHDFSArchive.groovy | 2 +-
.../live/TestAccLiveLocalArchive.groovy | 2 +-
.../accumulo/live/TestAccM1T1GC1Mon1.groovy | 2 +-
.../accumulo/live/TestAccM2T2GC1Mon1.groovy | 2 +-
.../accumulo/live/TestAccumuloAMWebApp.groovy | 2 +-
.../providers/hbase/HBaseProviderService.java | 4 +-
34 files changed, 570 insertions(+), 573 deletions(-)
----------------------------------------------------------------------