Merge branch 'develop' into feature/SLIDER-600-robust-history-reader
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/0ac74d5c Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0ac74d5c Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0ac74d5c Branch: refs/heads/develop Commit: 0ac74d5cda17fcc6712dfe8cb723426e596869f7 Parents: fd44d1c 566d120 Author: Steve Loughran <[email protected]> Authored: Tue Apr 7 11:43:06 2015 +0100 Committer: Steve Loughran <[email protected]> Committed: Tue Apr 7 11:43:06 2015 +0100 ---------------------------------------------------------------------- app-packages/accumulo/appConfig-default.json | 2 + .../accumulo/appConfig-secured-default.json | 3 +- .../accumulo/appConfig-ssl-default.json | 2 + .../accumulo/configuration/accumulo-env.xml | 15 + .../accumulo/package/files/accumulo-slider.py | 18 +- .../accumulo/package/scripts/accumulo_client.py | 47 +- .../accumulo/package/scripts/client_params.py | 3 +- app-packages/accumulo/package/scripts/params.py | 3 +- .../funtest/accumulo/AccumuloBasicIT.groovy | 10 +- .../funtest/accumulo/AccumuloScriptIT.groovy | 2 - .../app-pkg-template/appConfig-default.json | 1 + .../app-pkg-template/package/scripts/params.py | 1 + .../command-logger/slider-pkg/appConfig.json | 1 + .../slider-pkg/package/scripts/params.py | 1 + app-packages/hbase-win/appConfig-default.json | 1 + .../hbase-win/package/scripts/params.py | 1 + app-packages/hbase/appConfig-default.json | 1 + .../hbase/appConfig-phoenix-default.json | 1 + .../hbase/appConfig-secured-default.json | 1 + app-packages/hbase/hbase-slider.py | 28 +- app-packages/hbase/package/scripts/params.py | 1 + .../test/resources/appConfig_monitor_ssl.json | 1 + .../memcached-win/appConfig-default.json | 1 + .../memcached-win/package/scripts/params.py | 1 + app-packages/memcached/appConfig-default.json | 1 + .../memcached/package/scripts/params.py | 1 + app-packages/storm-win/appConfig-default.json | 1 + .../storm-win/package/scripts/params.py | 1 + app-packages/storm/appConfig-default.json | 1 + .../storm/appConfig-secured-default.json | 1 + app-packages/storm/package/scripts/params.py | 1 + pom.xml | 18 +- .../org/apache/slider/api/proto/Messages.java | 435 ++++++++++++++++--- .../slider/api/proto/RestTypeMarshalling.java | 4 + .../slider/api/types/ContainerInformation.java | 1 + .../org/apache/slider/client/SliderClient.java | 112 +++-- .../org/apache/slider/common/SliderKeys.java | 5 + .../slider/common/params/ActionPackageArgs.java | 7 + .../apache/slider/common/params/Arguments.java | 1 + .../slider/common/tools/CoreFileSystem.java | 10 +- .../apache/slider/common/tools/SliderUtils.java | 24 +- .../apache/slider/core/conf/AggregateConf.java | 13 + .../core/registry/docstore/ConfigFormat.java | 1 + .../PublishedConfigurationOutputter.java | 29 +- .../providers/agent/AgentClientProvider.java | 16 +- .../providers/agent/AgentProviderService.java | 8 +- .../server/appmaster/RoleLaunchService.java | 3 + .../server/appmaster/SliderAppMaster.java | 2 +- .../server/appmaster/state/RoleInstance.java | 9 + .../src/main/proto/SliderClusterMessages.proto | 4 +- .../actions/TestActionInstallPackage.groovy | 5 +- .../slider/agent/actions/TestActionList.groovy | 104 +++++ .../agent/actions/TestActionPackage.groovy | 7 +- .../standalone/TestBuildStandaloneAM.groovy | 3 +- .../client/TestPackageCommandOptions.groovy | 250 +++++++++++ .../registry/TestRegistryRestMarshalling.groovy | 1 - .../apache/slider/test/SliderTestUtils.groovy | 12 +- .../agent/TestAgentClientProvider2.java | 47 +- slider-core/src/test/resources/log4j.properties | 1 + 59 files changed, 1093 insertions(+), 192 deletions(-) ----------------------------------------------------------------------
