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/10/15 03:08:01 UTC
[23/23] git commit: Merge branch 'develop' into
feature/SLIDER-481_allow_dedicated_handling_of_exports
Merge branch 'develop' into feature/SLIDER-481_allow_dedicated_handling_of_exports
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/34e44871
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/34e44871
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/34e44871
Branch: refs/heads/feature/SLIDER-481_allow_dedicated_handling_of_exports
Commit: 34e44871efd17f0622fa55f94185f133b1a76a19
Parents: 1ef6a88 c31daa1
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Tue Oct 14 18:07:25 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Tue Oct 14 18:07:25 2014 -0700
----------------------------------------------------------------------
app-packages/accumulo/appConfig-default.json | 43 +++++--
.../accumulo/configuration/accumulo-env.xml | 89 +++++++++++++
app-packages/accumulo/configuration/client.xml | 44 +++++++
app-packages/accumulo/configuration/global.xml | 89 -------------
app-packages/accumulo/metainfo.xml | 10 ++
.../package/scripts/accumulo_configuration.py | 14 +-
app-packages/accumulo/package/scripts/params.py | 33 +++--
.../accumulo/package/templates/client.conf.j2 | 18 ---
app-packages/accumulo/resources-default.json | 4 +-
.../accumulo/AccumuloMonitorSSLIT.groovy | 1 -
.../AccumuloMonitorSSLLocalCertsIT.groovy | 72 +++++++++++
.../funtest/accumulo/AccumuloReadWriteIT.groovy | 6 +-
.../accumulo/AccumuloReadWriteSSLIT.groovy | 6 +-
.../funtest/accumulo/AccumuloSSLTestBase.groovy | 5 +-
slider-assembly/src/conf-hdp/slider-client.xml | 11 --
slider-assembly/src/conf/log4j.properties | 2 +
slider-assembly/src/conf/slider-client.xml | 10 +-
.../org/apache/slider/client/SliderClient.java | 127 ++++++++++++++-----
.../apache/slider/client/SliderClientAPI.java | 4 -
.../apache/slider/common/SliderXmlConfKeys.java | 2 +-
.../common/params/ActionDiagnosticArgs.java | 7 +-
.../common/params/ActionRegistryArgs.java | 6 +-
.../slider/common/params/ActionResolveArgs.java | 1 -
.../apache/slider/common/params/Arguments.java | 33 ++---
.../apache/slider/common/params/ClientArgs.java | 2 +-
.../slider/common/tools/ConfigHelper.java | 22 +++-
.../slider/core/launch/AbstractLauncher.java | 3 +-
.../core/registry/SliderRegistryUtils.java | 62 +++++++++
.../server/appmaster/SliderAppMaster.java | 9 +-
.../utility/AbstractSliderLaunchedService.java | 13 +-
.../TestStandaloneYarnRegistryAM.groovy | 29 ++++-
.../apache/slider/client/TestDiagnostics.groovy | 58 +++++++++
.../slider/common/tools/TestConfigHelper.groovy | 65 ++++++++++
.../common/tools/TestConfigHelperHDFS.groovy | 20 ---
.../slider/registry/TestRegistryPaths.groovy | 17 ++-
.../test/YarnZKMiniClusterTestBase.groovy | 2 +-
.../core/launch/TestAppMasterLauncher.java | 8 +-
.../agent/TestAgentProviderService.java | 13 +-
.../framework/AgentCommandTestBase.groovy | 7 +-
.../funtest/framework/CommandTestBase.groovy | 35 ++++-
.../funtest/framework/FuntestProperties.groovy | 6 +
.../slider/funtest/framework/SliderShell.groovy | 23 +++-
.../funtest/basic/ClusterConnectivityIT.groovy | 4 +-
.../commands/DiagnosticsCommandIT.groovy | 47 +++++++
.../lifecycle/AgentClusterLifecycleIT.groovy | 2 +-
.../funtest/lifecycle/AgentFailures2IT.groovy | 12 +-
.../lifecycle/ClusterBuildDestroyIT.groovy | 7 +-
.../accumulo/funtest/AccumuloCIIT.groovy | 4 +-
.../funtest/FunctionalHBaseClusterIT.groovy | 4 +-
.../funtest/HBaseClusterBuildDestroyIT.groovy | 4 +-
50 files changed, 812 insertions(+), 303 deletions(-)
----------------------------------------------------------------------