Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry
Conflicts: slider-core/src/main/java/org/apache/slider/core/launch/AbstractLauncher.java Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/a3e5b372 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a3e5b372 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a3e5b372 Branch: refs/heads/develop Commit: a3e5b372cc257b1df65ad35565eb743e0775a7af Parents: 65e7684 43f9a94 Author: Steve Loughran <ste...@apache.org> Authored: Fri Sep 26 14:48:14 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Fri Sep 26 14:50:02 2014 +0100 ---------------------------------------------------------------------- app-packages/accumulo/README.txt | 9 +- app-packages/accumulo/resources.json | 3 + .../accumulo/src/test/resources/resources.json | 3 + app-packages/app-pkg-template/README.txt | 7 +- .../app-pkg-template/appConfig-default.json | 21 ++++ app-packages/app-pkg-template/appConfig.json | 21 ---- .../app-pkg-template/resources-default.json | 16 +++ app-packages/app-pkg-template/resources.json | 16 --- app-packages/hbase-win/README.txt | 8 +- app-packages/hbase-win/appConfig-default.json | 38 +++++++ app-packages/hbase-win/appConfig.json | 38 ------- app-packages/hbase-win/resources-default.json | 24 ++++ app-packages/hbase-win/resources.json | 21 ---- app-packages/hbase-win/src/assembly/hbase.xml | 4 +- app-packages/hbase/README.txt | 7 +- app-packages/hbase/appConfig-default.json | 47 ++++++++ app-packages/hbase/appConfig.json | 47 -------- app-packages/hbase/pom.xml | 4 +- app-packages/hbase/resources-default.json | 36 ++++++ app-packages/hbase/resources.json | 36 ------ app-packages/hbase/src/assembly/hbase.xml | 4 +- .../src/test/resources/resources-default.json | 24 ++++ .../hbase/src/test/resources/resources.json | 21 ---- app-packages/memcached-win/README.txt | 7 +- .../memcached-win/appConfig-default.json | 24 ++++ app-packages/memcached-win/appConfig.json | 24 ---- .../memcached-win/resources-default.json | 16 +++ app-packages/memcached-win/resources.json | 16 --- app-packages/memcached/README.txt | 7 +- app-packages/memcached/appConfig-default.json | 24 ++++ app-packages/memcached/appConfig.json | 24 ---- app-packages/memcached/resources-default.json | 16 +++ app-packages/memcached/resources.json | 16 --- app-packages/storm/README.txt | 7 +- app-packages/storm/appConfig-default.json | 46 ++++++++ app-packages/storm/appConfig.json | 46 -------- app-packages/storm/resources-default.json | 34 ++++++ app-packages/storm/resources.json | 31 ----- app-packages/storm/src/assembly/storm.xml | 4 +- pom.xml | 2 +- .../python/agent/CustomServiceOrchestrator.py | 15 ++- .../src/main/python/agent/ProcessHelper.py | 5 +- slider-agent/src/main/python/agent/main.py | 13 ++- .../agent/TestCustomServiceOrchestrator.py | 20 +++- .../org/apache/slider/api/ResourceKeys.java | 3 + .../org/apache/slider/client/SliderClient.java | 8 +- .../slider/core/launch/AbstractLauncher.java | 52 +++++++++ .../slider/core/launch/AppMasterLauncher.java | 4 +- .../slider/providers/agent/AgentKeys.java | 2 +- .../providers/agent/AgentProviderService.java | 6 +- .../web/rest/agent/ExecutionCommand.java | 1 + .../actions/TestActionInstallPackage.groovy | 6 +- .../core/launch/TestAppMasterLauncher.java | 112 +++++++++++++++++++ .../agent/TestAgentProviderService.java | 2 +- 54 files changed, 624 insertions(+), 424 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a3e5b372/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index fed95a8,b31d476..bfc52bd --- a/pom.xml +++ b/pom.xml @@@ -136,10 -136,10 +136,10 @@@ <!-- core artifacts --> - <hadoop.version>2.6.0-SNAPSHOT</hadoop.version> + <hadoop.version>3.0.0-SNAPSHOT</hadoop.version> <hbase.version>0.98.4-hadoop2</hbase.version> - <accumulo.version>1.6.1-SNAPSHOT</accumulo.version> + <accumulo.version>1.6.1</accumulo.version> <!-- artifact versions http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a3e5b372/slider-core/src/main/java/org/apache/slider/client/SliderClient.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a3e5b372/slider-core/src/main/java/org/apache/slider/core/launch/AbstractLauncher.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a3e5b372/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java ----------------------------------------------------------------------