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/10/09 00:53:06 UTC
[17/50] [abbrv] git commit: Merge branch 'develop' into
feature/SLIDER-149_Support_a_YARN_service_registry
Merge branch '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/db52ff56
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/db52ff56
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/db52ff56
Branch: refs/heads/develop
Commit: db52ff5600a5825a7f2699ea11e14f8b1ff12d3d
Parents: 821d306 937e0a7
Author: Steve Loughran <st...@apache.org>
Authored: Tue Sep 23 21:06:17 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Sep 23 21:06:17 2014 +0100
----------------------------------------------------------------------
app-packages/accumulo/appConfig.json | 8 +-
app-packages/accumulo/metainfo.xml | 4 +-
app-packages/accumulo/pom.xml | 50 +++-----
app-packages/accumulo/src/assembly/accumulo.xml | 1 -
.../apache/slider/accumulo/ProviderUtil.java | 25 +---
.../funtest/accumulo/AccumuloBasicIT.groovy | 30 ++++-
.../accumulo/AccumuloMonitorSSLIT.groovy | 18 ++-
.../funtest/accumulo/AccumuloSSLTestBase.groovy | 19 +++-
.../accumulo/src/test/resources/appConfig.json | 55 ---------
.../src/test/resources/appConfig_kerberos.json | 57 ----------
.../test/resources/appConfig_monitor_ssl.json | 55 ---------
.../appConfig_monitor_ssl_kerberos.json | 57 ----------
.../src/test/resources/appConfig_ssl.json | 57 ----------
.../test/resources/appConfig_ssl_kerberos.json | 59 ----------
.../command-logger/slider-pkg/appConfig.json | 2 +-
app-packages/hbase-win/README.txt | 29 +++--
app-packages/hbase-win/appConfig.json | 72 ++++++------
app-packages/hbase-win/metainfo.xml | 8 +-
...se-0.98.0.2.1.5.0-2047-hadoop2.zip.REPLACEME | 17 ---
app-packages/hbase-win/pom.xml | 94 +++++++++++++++
app-packages/hbase-win/src/assembly/hbase.xml | 68 +++++++++++
app-packages/hbase/appConfig.json | 2 +-
app-packages/hbase/ganglia_metrics.json | 38 +++++++
app-packages/hbase/metainfo.xml | 10 +-
app-packages/hbase/resources.json | 2 +-
app-packages/memcached-win/appConfig.json | 2 +-
app-packages/memcached/appConfig.json | 2 +-
app-packages/storm/appConfig.json | 4 +-
app-packages/storm/metainfo.xml | 32 +++++-
app-packages/storm/package/scripts/params.py | 4 +
app-packages/storm/package/scripts/service.py | 40 ++++---
.../storm/package/scripts/status_params.py | 2 +
.../storm/package/templates/config.yaml.j2 | 9 ++
app-packages/storm/resources.json | 4 +
pom.xml | 23 ++++
slider-assembly/src/conf-hdp/slider-client.xml | 28 +++--
slider-assembly/src/conf-hdp/slider-env.sh | 26 +++++
slider-assembly/src/conf/slider-client.xml | 44 ++++----
slider-assembly/src/conf/slider-env.sh | 26 +++++
slider-assembly/src/main/scripts/slider | 9 +-
slider-assembly/src/main/scripts/slider.py | 44 ++++++--
.../org/apache/slider/api/InternalKeys.java | 4 +
.../org/apache/slider/client/SliderClient.java | 7 +-
.../common/SliderXMLConfKeysForTesting.java | 2 +
.../AbstractClusterBuildingActionArgs.java | 4 +
.../apache/slider/common/params/Arguments.java | 1 +
.../slider/core/build/InstanceBuilder.java | 16 +++
.../slider/core/persist/JsonSerDeser.java | 17 +++
.../providers/agent/AgentProviderService.java | 2 +-
.../test_command_log/appConfig.json | 4 +-
.../test_command_log/appConfig_fast_no_reg.json | 3 +-
.../test_command_log/appConfig_no_hb.json | 4 +-
.../resources_queue_labels.json | 17 +++
.../providers/agent/TestBuildBasicAgent.groovy | 39 ++++++-
slider-funtest/pom.xml | 1 +
.../framework/AgentCommandTestBase.groovy | 79 ++++++++-----
.../funtest/lifecycle/AMFailuresIT.groovy | 1 -
.../lifecycle/AgentClusterLifecycleIT.groovy | 1 -
.../funtest/lifecycle/AgentFailures2IT.groovy | 1 -
.../funtest/lifecycle/AgentFailuresIT.groovy | 1 -
.../funtest/lifecycle/AppsThroughAgentIT.groovy | 1 -
.../AppsThroughAgentQueueAndLabelsIT.groovy | 113 +++++++++++++++++++
.../lifecycle/ClusterBuildDestroyIT.groovy | 1 -
.../clusters/remote/slider/slider-client.xml | 14 ++-
64 files changed, 852 insertions(+), 617 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/db52ff56/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/db52ff56/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/db52ff56/slider-core/src/main/java/org/apache/slider/core/persist/JsonSerDeser.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/db52ff56/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
----------------------------------------------------------------------