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/03 00:26:04 UTC

[7/7] git commit: Merge branch 'feature/SLIDER-470_slider_appears_to_support_negative_component_counts' into develop

Merge branch 'feature/SLIDER-470_slider_appears_to_support_negative_component_counts' 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/2051dd64
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/2051dd64
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/2051dd64

Branch: refs/heads/develop
Commit: 2051dd6411b47c2ec3ea6de0cf3b77ddc054df22
Parents: 6b011d9 cbf3a63
Author: Steve Loughran <st...@apache.org>
Authored: Thu Oct 2 14:59:14 2014 -0700
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Oct 2 14:59:14 2014 -0700

----------------------------------------------------------------------
 .../org/apache/slider/client/SliderClient.java  | 48 +++++-----
 .../apache/slider/core/conf/AggregateConf.java  | 20 +++++
 .../apache/slider/core/conf/MapOperations.java  | 16 +++-
 .../providers/AbstractClientProvider.java       |  9 +-
 .../apache/slider/providers/ProviderCore.java   |  9 +-
 .../slideram/SliderAMClientProvider.java        | 28 ++++++
 .../server/appmaster/SliderAppMaster.java       | 52 +++++++----
 .../appmaster/actions/ActionStopQueue.java      |  8 +-
 .../server/appmaster/actions/AsyncAction.java   |  2 +-
 .../server/appmaster/actions/QueueExecutor.java |  2 +
 .../slider/server/appmaster/state/AppState.java |  5 +-
 .../server/appmaster/state/RoleStatus.java      | 20 +++++
 .../TestFreezeThawFlexStandaloneAM.groovy       | 94 ++++++++++++++++++++
 .../TestFreezeThawMasterlessAM.groovy           | 92 -------------------
 .../standalone/TestBuildStandaloneAM.groovy     | 25 ++++--
 .../standalone/TestStandaloneAgentAM.groovy     |  2 +-
 .../slider/providers/agent/TestAgentEcho.groovy | 18 +++-
 .../build/TestBuildThawClusterM1W1.groovy       |  3 +-
 18 files changed, 298 insertions(+), 155 deletions(-)
----------------------------------------------------------------------