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/15 17:11:49 UTC
[8/8] git commit: Merge branch
'feature/SLIDER-320-endpoints-in-roleinstances' into develop
Merge branch 'feature/SLIDER-320-endpoints-in-roleinstances' 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/8050466f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8050466f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8050466f
Branch: refs/heads/develop
Commit: 8050466fc3d395e8a31fc760c612b9140e94e3a6
Parents: 4ea66fa 4610c25
Author: Steve Loughran <st...@apache.org>
Authored: Fri Aug 15 16:11:25 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Aug 15 16:11:25 2014 +0100
----------------------------------------------------------------------
.../providers/agent/AgentProviderService.java | 32 +++++-
.../server/appmaster/SliderAppMaster.java | 46 ++++++--
.../actions/RegisterComponentInstance.java | 48 ++++++++
.../actions/UnregisterComponentInstance.java | 46 ++++++++
.../slider/server/appmaster/state/AppState.java | 115 ++++++++++++++-----
.../appmaster/state/ProviderAppState.java | 17 ++-
.../server/appmaster/state/RoleInstance.java | 42 ++++++-
.../state/StateAccessForProviders.java | 13 ++-
.../appmaster/web/view/ContainerStatsBlock.java | 2 +-
.../server/appmaster/web/view/IndexBlock.java | 3 +-
.../slider/providers/agent/TestAgentEcho.groovy | 2 +-
.../providers/hbase/HBaseProviderService.java | 11 +-
12 files changed, 312 insertions(+), 65 deletions(-)
----------------------------------------------------------------------