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/11/02 15:25:50 UTC
[38/50] git commit: Merge branch
'feature/SLIDER-587-dynamic_role_placement' into develop
Merge branch 'feature/SLIDER-587-dynamic_role_placement' 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/f83ce757
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f83ce757
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f83ce757
Branch: refs/heads/feature/SLIDER-531-registry-enhancements
Commit: f83ce7571aeafcf782d6462ef779479c1f08924c
Parents: a9e81c0 0b06d63
Author: Steve Loughran <st...@apache.org>
Authored: Fri Oct 31 21:24:32 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Oct 31 21:24:32 2014 +0000
----------------------------------------------------------------------
.../slider/server/appmaster/state/AppState.java | 37 ++--
.../server/appmaster/state/NodeEntry.java | 12 +-
.../server/appmaster/state/NodeInstance.java | 4 +-
.../server/appmaster/state/RoleHistory.java | 52 +++--
.../server/appmaster/state/RoleInstance.java | 5 +
.../TestMockAppStateContainerFailure.groovy | 7 +-
.../TestMockAppStateDynamicHistory.groovy | 211 +++++++++++++++++++
.../TestMockAppStateDynamicRoles.groovy | 14 +-
.../TestMockAppStateFlexDynamicRoles.groovy | 5 +-
.../TestMockAppStateRMOperations.groovy | 3 +-
.../TestMockAppStateRebuildOnAMRestart.groovy | 10 +-
.../TestMockAppStateRolePlacement.groovy | 4 +-
.../appmaster/model/mock/Allocator.groovy | 8 +-
.../model/mock/BaseMockAppStateTest.groovy | 36 +++-
.../appmaster/model/mock/MockAppState.groovy | 25 +++
15 files changed, 364 insertions(+), 69 deletions(-)
----------------------------------------------------------------------