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/09/09 17:14:45 UTC
[05/47] git commit: Merge branch
'feature/SLIDER-327_AM_to_move_to_optimized,
_queued_Node_review_and_refresh_action' into develop
Merge branch 'feature/SLIDER-327_AM_to_move_to_optimized,_queued_Node_review_and_refresh_action' 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/e7dd217a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e7dd217a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e7dd217a
Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: e7dd217a324c205826bea4ac040b808c4ad72d61
Parents: b525287 88b665d
Author: Steve Loughran <st...@apache.org>
Authored: Tue Sep 2 21:02:29 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Sep 2 21:02:29 2014 +0100
----------------------------------------------------------------------
.../org/apache/slider/client/SliderClient.java | 9 +--
.../server/appmaster/RoleLaunchService.java | 8 +--
.../server/appmaster/SliderAppMaster.java | 66 ++++++++++++++------
.../server/appmaster/actions/ActionHalt.java | 6 +-
.../appmaster/actions/ActionKillContainer.java | 20 +++++-
.../appmaster/actions/ActionStartContainer.java | 8 ++-
.../appmaster/actions/ActionStopSlider.java | 6 +-
.../server/appmaster/actions/AsyncAction.java | 47 ++++----------
.../actions/ProviderReportedContainerLoss.java | 13 ++--
.../actions/ProviderStartupCompleted.java | 4 --
.../server/appmaster/actions/QueueAccess.java | 5 ++
.../server/appmaster/actions/QueueService.java | 11 +++-
.../actions/RegisterComponentInstance.java | 5 ++
.../actions/ReviewAndFlexApplicationSize.java | 43 +++++++++++++
.../actions/UnregisterComponentInstance.java | 7 ++-
.../server/appmaster/monkey/ChaosEntry.java | 2 +-
.../TestStandaloneAMMonkeyRestart.groovy | 8 +--
.../providers/accumulo/AccumuloTestBase.groovy | 4 +-
.../minicluster/HBaseMiniClusterTestBase.groovy | 1 -
.../flexing/TestClusterFlex1To1.groovy | 2 +-
20 files changed, 176 insertions(+), 99 deletions(-)
----------------------------------------------------------------------