[49/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 Conflicts: slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.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/851f4474 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/851f4474 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/851f4474 Branch: refs/heads/develop Commit: 851f447484cd291eec21bb576f75ba0ad6f60565 Parents: 66957d4 3b32b8f Author: Steve Loughran ste...@apache.org Authored: Wed Oct 8 15:51:53 2014 -0700 Committer: Steve Loughran ste...@apache.org Committed: Wed Oct 8 15:51:53 2014 -0700 -- app-packages/hbase-win/metainfo.xml | 2 - app-packages/hbase/metainfo.xml | 4 - app-packages/hbase/pom.xml | 1 + app-packages/storm/metainfo.xml | 3 + .../org/apache/slider/client/SliderClient.java | 20 +++-- .../providers/AbstractClientProvider.java | 4 +- .../providers/agent/AgentClientProvider.java| 79 +++- .../slider/providers/agent/AgentKeys.java | 2 +- .../providers/agent/AgentProviderService.java | 43 --- .../agent/application/metadata/Component.java | 28 +++ .../agent/application/metadata/Metainfo.java| 19 + .../slideram/SliderAMClientProvider.java| 4 +- .../server/appmaster/SliderAppMaster.java | 2 +- .../providers/agent/TestBuildBasicAgent.groovy | 65 ++-- .../agent/TestAgentClientProvider.java | 2 +- .../publisher/TestAgentProviderService.java | 1 + slider-core/src/test/python/metainfo.xml| 21 ++ .../providers/agent/tests/bad/resources-3.json | 13 .../providers/agent/tests/good/resources.json | 4 +- .../accumulo/AccumuloClientProvider.java| 4 +- .../accumulo/AccumuloProviderService.java | 2 +- .../providers/hbase/HBaseClientProvider.java| 4 +- .../providers/hbase/HBaseProviderService.java | 4 +- 23 files changed, 264 insertions(+), 67 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/851f4474/slider-core/src/main/java/org/apache/slider/client/SliderClient.java -- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/851f4474/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java -- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/851f4474/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMClientProvider.java -- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/851f4474/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java -- diff --cc slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java index a920a3e,31a9a28..6a3f48b --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java @@@ -815,9 -809,11 +815,9 @@@ public class SliderAppMaster extends Ab appState.noteAMLaunched(); --//Give the provider restricted access to the state, registry -providerService.bind(stateForProviders, registry, actionQueues, - liveContainers); -sliderAMProvider.bind(stateForProviders, registry, actionQueues, - liveContainers); ++//Give the provider access to the state, and AM +providerService.bind(stateForProviders, actionQueues, liveContainers); +sliderAMProvider.bind(stateForProviders, actionQueues, liveContainers); // chaos monkey maybeStartMonkey(); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/851f4474/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/publisher/TestAgentProviderService.java -- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/851f4474/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java --
[49/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/02521641 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/02521641 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/02521641 Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: 0252164151cfa64f50b66a2570b8ed1d7b5706b6 Parents: 4f5bf0a 624cafe Author: Steve Loughran ste...@apache.org Authored: Tue Aug 19 14:09:30 2014 +0100 Committer: Steve Loughran ste...@apache.org Committed: Tue Aug 19 14:09:30 2014 +0100 -- app-packages/accumulo/pom.xml | 11 ++ pom.xml | 24 ++- slider-agent/src/main/python/kazoo/LICENSE | 176 +++ slider-agent/src/main/python/kazoo/__init__.py | 1 + slider-agent/src/main/python/kazoo/client.py| 1 + .../src/main/python/kazoo/exceptions.py | 1 + .../src/main/python/kazoo/handlers/__init__.py | 1 + .../src/main/python/kazoo/handlers/gevent.py| 6 +- .../src/main/python/kazoo/handlers/threading.py | 4 +- .../src/main/python/kazoo/handlers/utils.py | 1 + slider-agent/src/main/python/kazoo/hosts.py | 1 + .../src/main/python/kazoo/interfaces.py | 1 + .../src/main/python/kazoo/loggingsupport.py | 1 + .../src/main/python/kazoo/protocol/__init__.py | 1 + .../main/python/kazoo/protocol/connection.py| 1 + .../src/main/python/kazoo/protocol/paths.py | 1 + .../main/python/kazoo/protocol/serialization.py | 1 + .../src/main/python/kazoo/protocol/states.py| 1 + .../src/main/python/kazoo/recipe/__init__.py| 1 + .../src/main/python/kazoo/recipe/barrier.py | 1 + .../src/main/python/kazoo/recipe/counter.py | 1 + .../src/main/python/kazoo/recipe/election.py| 1 + .../src/main/python/kazoo/recipe/lock.py| 1 + .../src/main/python/kazoo/recipe/partitioner.py | 1 + .../src/main/python/kazoo/recipe/party.py | 1 + .../src/main/python/kazoo/recipe/queue.py | 1 + .../src/main/python/kazoo/recipe/watchers.py| 1 + slider-agent/src/main/python/kazoo/retry.py | 1 + slider-agent/src/main/python/kazoo/security.py | 1 + .../src/main/python/kazoo/testing/__init__.py | 1 + .../src/main/python/kazoo/testing/common.py | 1 + .../src/main/python/kazoo/testing/harness.py| 1 + .../src/main/python/kazoo/tests/__init__.py | 1 + .../src/main/python/kazoo/tests/test_barrier.py | 1 + .../src/main/python/kazoo/tests/test_build.py | 1 + .../src/main/python/kazoo/tests/test_client.py | 1 + .../main/python/kazoo/tests/test_connection.py | 1 + .../src/main/python/kazoo/tests/test_counter.py | 1 + .../main/python/kazoo/tests/test_election.py| 1 + .../main/python/kazoo/tests/test_exceptions.py | 1 + .../python/kazoo/tests/test_gevent_handler.py | 1 + .../src/main/python/kazoo/tests/test_lock.py| 1 + .../main/python/kazoo/tests/test_partitioner.py | 1 + .../src/main/python/kazoo/tests/test_party.py | 1 + .../src/main/python/kazoo/tests/test_paths.py | 1 + .../src/main/python/kazoo/tests/test_queue.py | 1 + .../src/main/python/kazoo/tests/test_retry.py | 1 + .../main/python/kazoo/tests/test_security.py| 1 + .../kazoo/tests/test_threading_handler.py | 1 + .../main/python/kazoo/tests/test_watchers.py| 1 + .../src/main/python/kazoo/tests/util.py | 1 + slider-assembly/pom.xml | 14 -- slider-core/pom.xml | 16 +- .../accumulo/accumulo-funtests/pom.xml | 23 +++ slider-providers/hbase/hbase-funtests/pom.xml | 5 + src/test/clusters/c6401/slider/log4j.properties | 25 +-- .../clusters/morzine/slider/log4j.properties| 25 +-- .../clusters/offline/slider/log4j.properties| 25 +-- .../clusters/remote/slider/log4j.properties | 25 +-- .../clusters/sandbox/slider/log4j.properties| 25 +-- 60 files changed, 375 insertions(+), 75 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/02521641/pom.xml -- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/02521641/slider-core/pom.xml --
