Merge branch 'feature/SLIDER-504-registry-config-docs' 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/6c437439 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6c437439 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6c437439 Branch: refs/heads/develop Commit: 6c4374392302bc497a5a6bde859d81a63e3e5400 Parents: 0769354 9856b24 Author: Steve Loughran <[email protected]> Authored: Mon Oct 13 16:20:04 2014 -0700 Committer: Steve Loughran <[email protected]> Committed: Mon Oct 13 16:20:04 2014 -0700 ---------------------------------------------------------------------- .../funtest/accumulo/AccumuloReadWriteIT.groovy | 4 +- .../accumulo/AccumuloReadWriteSSLIT.groovy | 4 +- .../org/apache/slider/client/SliderClient.java | 4 +- .../apache/slider/common/SliderXmlConfKeys.java | 2 +- .../slider/common/tools/ConfigHelper.java | 20 +++++- .../utility/AbstractSliderLaunchedService.java | 13 ++-- .../slider/common/tools/TestConfigHelper.groovy | 65 ++++++++++++++++++++ .../common/tools/TestConfigHelperHDFS.groovy | 20 ------ .../test/YarnZKMiniClusterTestBase.groovy | 2 +- .../agent/TestAgentProviderService.java | 13 ++-- .../funtest/framework/CommandTestBase.groovy | 5 +- .../funtest/basic/ClusterConnectivityIT.groovy | 4 +- .../lifecycle/ClusterBuildDestroyIT.groovy | 4 +- .../accumulo/funtest/AccumuloCIIT.groovy | 4 +- .../funtest/FunctionalHBaseClusterIT.groovy | 4 +- .../funtest/HBaseClusterBuildDestroyIT.groovy | 4 +- 16 files changed, 123 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6c437439/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java ----------------------------------------------------------------------
