You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/05/28 04:21:10 UTC
[05/44] git commit: Merge branch 'feature/SLIDER-35' into develop
Merge branch 'feature/SLIDER-35' 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/dabe3407
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/dabe3407
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/dabe3407
Branch: refs/heads/master
Commit: dabe3407355df8034c5822b55256f814df00845c
Parents: c972b2c ea16c7b
Author: Steve Loughran <st...@hortonworks.com>
Authored: Wed May 21 15:59:16 2014 +0100
Committer: Steve Loughran <st...@hortonworks.com>
Committed: Wed May 21 15:59:16 2014 +0100
----------------------------------------------------------------------
.../org/apache/slider/client/SliderClient.java | 2 +-
.../core/registry/info/ServiceInstanceData.java | 51 +++++++++++++++++++-
.../providers/AbstractClientProvider.java | 1 -
.../providers/AbstractProviderService.java | 4 +-
.../apache/slider/providers/ProviderRole.java | 5 +-
.../slider/providers/ProviderService.java | 1 -
.../apache/slider/providers/ProviderUtils.java | 6 +--
.../slider/providers/SliderProviderFactory.java | 4 --
.../slideram/SliderAMClientProvider.java | 4 +-
.../server/appmaster/SliderAppMaster.java | 13 ++---
.../web/rest/publisher/PublisherResource.java | 2 +-
.../services/curator/RegistryBinderService.java | 29 +++++------
.../registry/RegistryViewForProviders.java | 9 +---
.../registry/SliderRegistryService.java | 21 +++-----
.../standalone/TestStandaloneAgentAM.groovy | 4 +-
.../standalone/TestStandaloneRegistryAM.groovy | 4 +-
.../publisher/TestPublisherRestResources.groovy | 23 +++++----
.../apache/slider/test/SliderTestUtils.groovy | 15 +++---
.../publisher/TestAgentProviderService.java | 4 +-
.../providers/hbase/HBaseClientProvider.java | 6 +--
.../slider/providers/hbase/HBaseKeys.java | 4 ++
.../providers/hbase/HBaseProviderService.java | 25 ++++------
.../minicluster/live/TestHBaseMaster.groovy | 23 +++++++--
.../minicluster/live/TestTwoLiveClusters.groovy | 28 ++++++++---
24 files changed, 169 insertions(+), 119 deletions(-)
----------------------------------------------------------------------