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 2015/03/24 21:01:38 UTC
[06/20] incubator-slider git commit: Merge branch 'develop' into
feature/SLIDER-799-AM-managed-relax
Merge branch 'develop' into feature/SLIDER-799-AM-managed-relax
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/a0d76b74
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a0d76b74
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a0d76b74
Branch: refs/heads/feature/SLIDER-799-AM-managed-relax
Commit: a0d76b74836df671e1456ddc92c9cb7a423c7cf1
Parents: 0dd979c 38fed99
Author: Steve Loughran <st...@apache.org>
Authored: Mon Mar 16 12:01:12 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Mar 16 12:01:12 2015 +0000
----------------------------------------------------------------------
app-packages/accumulo/accumulo-slider | 53 -
app-packages/accumulo/accumulo-slider.py | 378 -----
app-packages/accumulo/appConfig-default.json | 1 -
.../accumulo/appConfig-secured-default.json | 1 -
.../accumulo/appConfig-ssl-default.json | 99 ++
.../accumulo/clientInstallConfig-default.json | 6 +
.../accumulo/configuration/accumulo-env.xml | 2 +-
app-packages/accumulo/configuration/client.xml | 5 -
app-packages/accumulo/metainfo.xml | 2 +-
.../accumulo/package/files/accumulo-slider | 59 +
.../accumulo/package/files/accumulo-slider.py | 182 +++
.../accumulo/package/scripts/accumulo_client.py | 81 +-
.../package/scripts/accumulo_configuration.py | 73 +-
.../accumulo/package/scripts/client_params.py | 48 +
app-packages/accumulo/package/scripts/params.py | 21 +-
.../package/templates/accumulo-env.sh.j2 | 42 -
.../package/templates/accumulo-slider-env.sh.j2 | 17 +
.../hadoop-metrics2-accumulo.properties.j2 | 2 +-
app-packages/accumulo/pom.xml | 14 +-
app-packages/accumulo/src/assembly/accumulo.xml | 15 +-
.../funtest/accumulo/AccumuloBasicIT.groovy | 6 +-
.../accumulo/AccumuloMonitorSSLIT.groovy | 8 +
.../funtest/accumulo/AccumuloReadWriteIT.groovy | 3 +-
.../accumulo/AccumuloReadWriteSSLIT.groovy | 27 +-
.../funtest/accumulo/AccumuloSSLTestBase.groovy | 86 +-
.../funtest/accumulo/AccumuloScriptIT.groovy | 96 +-
.../funtest/accumulo/AccumuloScriptSSLIT.groovy | 147 ++
.../funtest/accumulo/AccumuloSliderShell.groovy | 7 -
.../slider/funtest/accumulo/CertUtil.java | 275 ----
.../resources/clientInstallConfig-ssl-test.json | 7 +
.../src/test/resources/test_shell_cmd_file | 20 +
app-packages/hbase-win/README.txt | 10 +-
app-packages/hbase/README.md | 11 +-
...-metrics2-hbase.properties-GANGLIA-MASTER.j2 | 2 +-
...doop-metrics2-hbase.properties-GANGLIA-RS.j2 | 2 +-
pom.xml | 2 +-
slider-assembly/src/main/scripts/slider | 4 +-
slider-core/pom.xml | 2 +
.../slider/api/SliderClusterProtocol.java | 6 +-
.../org/apache/slider/api/proto/Messages.java | 1503 +++++++++++++++++-
.../slider/api/proto/RestTypeMarshalling.java | 24 +
.../slider/api/proto/SliderClusterAPI.java | 81 +-
.../org/apache/slider/client/SliderClient.java | 120 +-
.../apache/slider/client/SliderClientAPI.java | 2 +-
.../client/ipc/SliderClusterOperations.java | 21 +-
.../slider/common/params/ActionClientArgs.java | 33 +
.../apache/slider/common/params/Arguments.java | 6 +
.../slider/common/params/SliderActions.java | 4 +-
.../apache/slider/common/tools/PortScanner.java | 2 +-
.../providers/AbstractClientProvider.java | 8 +-
.../providers/agent/AgentClientProvider.java | 25 +-
.../providers/agent/AgentProviderService.java | 6 +-
.../server/appmaster/SliderAppMaster.java | 6 +-
.../management/MetricsBindingService.java | 18 +-
.../rpc/SliderClusterProtocolPBImpl.java | 12 +
.../rpc/SliderClusterProtocolProxy.java | 10 +
.../server/appmaster/rpc/SliderIPCService.java | 39 +-
.../appmaster/rpc/SliderRPCSecurityInfo.java | 4 +-
.../services/security/CertificateManager.java | 28 +-
.../src/main/proto/SliderClusterMessages.proto | 11 +
.../src/main/proto/SliderClusterProtocol.proto | 5 +-
.../agent/TestAgentClientProvider2.java | 34 +-
.../AMClientCertStoreRetrievalIT.groovy | 246 +++
63 files changed, 3018 insertions(+), 1052 deletions(-)
----------------------------------------------------------------------