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/04 15:03:53 UTC
[07/11] git commit: Merge remote-tracking branch 'apache/develop'
into feature/SLIDER-149_Support_a_YARN_service_registry
Merge remote-tracking branch 'apache/develop' into feature/SLIDER-149_Support_a_YARN_service_registry
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/bfbe3125
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/bfbe3125
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/bfbe3125
Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: bfbe31253c0fd90d956adc14fef024219311ecf2
Parents: d8d3671 8c6c6b6
Author: Steve Loughran <st...@apache.org>
Authored: Fri Aug 1 20:46:30 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Aug 1 20:46:30 2014 +0100
----------------------------------------------------------------------
slider-assembly/pom.xml | 6 +--
.../org/apache/slider/common/SliderKeys.java | 2 +-
.../agent/actions/TestActionExists.groovy | 2 +-
.../slider/agent/actions/TestActionList.groovy | 2 +-
.../agent/actions/TestActionStatus.groovy | 6 +--
.../agent/freezethaw/TestFreezeCommands.groovy | 3 +-
.../TestFreezeThawMasterlessAM.groovy | 3 +-
.../freezethaw/TestFreezeUnknownCluster.groovy | 3 +-
.../freezethaw/TestThawUnknownCluster.groovy | 3 +-
.../agent/standalone/TestBadAMHeap.groovy | 3 +-
.../agent/standalone/TestBadYarnQueue.groovy | 3 +-
.../standalone/TestBuildStandaloneAM.groovy | 6 +--
.../standalone/TestDestroyMasterlessAM.groovy | 3 +-
.../standalone/TestKillMasterlessAM.groovy | 3 +-
.../standalone/TestStandaloneAgentAM.groovy | 3 +-
.../standalone/TestStandaloneRegistryAM.groovy | 3 +-
.../agent/TestAgentAMManagementWS.groovy | 4 +-
.../slider/providers/agent/TestAgentEcho.groovy | 4 +-
.../providers/agent/TestBuildBasicAgent.groovy | 39 ++++++++------------
.../curator/TestRegistryRestResources.groovy | 10 +++--
.../publisher/TestPublisherRestResources.groovy | 5 +--
.../apache/slider/test/SliderTestBase.groovy | 17 ++++++++-
.../slider/test/YarnMiniClusterTestBase.groovy | 21 +++++------
.../test/YarnZKMiniClusterTestBase.groovy | 22 +++++++++--
.../providers/accumulo/AccumuloTestBase.groovy | 2 +-
.../live/TestAccCorrectInstanceName.groovy | 4 +-
.../live/TestAccFlexTablets133Mgr113.groovy | 3 +-
.../accumulo/live/TestAccFlexTablets1to3.groovy | 2 +-
.../accumulo/live/TestAccFreezeThaw.groovy | 4 +-
.../accumulo/live/TestAccLiveHDFSArchive.groovy | 4 +-
.../live/TestAccLiveLocalArchive.groovy | 4 +-
.../accumulo/live/TestAccM1T1GC1Mon1.groovy | 3 +-
.../accumulo/live/TestAccM2T2GC1Mon1.groovy | 4 +-
.../accumulo/live/TestAccumuloAMWebApp.groovy | 4 +-
.../live/TestInvalidMonitorAddress.groovy | 3 +-
.../TestFreezeThawClusterFromArchive.groovy | 3 +-
.../archives/TestLiveClusterFromArchive.groovy | 4 +-
.../TestLiveClusterFromArchiveOnHDFS.groovy | 2 +-
.../build/TestBuildThawClusterM1W1.groovy | 3 +-
.../failures/TestFailedRegionService.groovy | 7 ++--
.../failures/TestFailureThreshold.groovy | 5 +--
.../failures/TestKilledHBaseAM.groovy | 3 +-
.../failures/TestKilledHBaseMaster.groovy | 4 +-
.../flexing/TestClusterFlex0To1.groovy | 2 +-
.../flexing/TestClusterFlex1To1.groovy | 4 +-
.../flexing/TestClusterFlex1To2.groovy | 4 +-
.../flexing/TestClusterFlex2DownTo1.groovy | 2 +-
.../flexing/TestClusterFlex2To5.groovy | 4 +-
.../flexing/TestClusterFlexDownToZero.groovy | 4 +-
.../flexing/TestHMasterFlex1To2.groovy | 4 +-
...reezeReconfigureThawLiveRegionService.groovy | 3 +-
.../TestFreezeThawLiveRegionService.groovy | 3 +-
.../minicluster/live/Test2Master2RS.groovy | 3 +-
.../minicluster/live/TestHBaseMaster.groovy | 3 +-
.../live/TestHBaseMasterOnHDFS.groovy | 4 +-
.../live/TestHBaseMasterWithBadHeap.groovy | 3 +-
.../live/TestLiveRegionServiceOnHDFS.groovy | 4 +-
.../live/TestLiveTwoNodeRegionService.groovy | 4 +-
.../minicluster/live/TestTwoLiveClusters.groovy | 3 +-
.../masterless/TestRoleOptPropagation.groovy | 6 +--
.../TestSliderConfDirToMasterlessAM.groovy | 3 +-
61 files changed, 146 insertions(+), 161 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfbe3125/slider-core/src/test/groovy/org/apache/slider/test/YarnMiniClusterTestBase.groovy
----------------------------------------------------------------------