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/08/12 16:32:20 UTC
[6/9] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-slider into develop
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/52248b79
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/52248b79
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/52248b79
Branch: refs/heads/develop
Commit: 52248b793c8fffb83513bd02eac83d1d93d8ec8d
Parents: a8cdabc 49e2881
Author: Steve Loughran <st...@apache.org>
Authored: Tue Aug 12 14:12:52 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Aug 12 14:12:52 2014 +0100
----------------------------------------------------------------------
slider-agent/pom.xml | 4 +-
.../src/main/python/agent/AgentConfig.py | 2 +
slider-agent/src/main/python/agent/Constants.py | 4 +-
.../src/main/python/agent/Controller.py | 52 +-
slider-agent/src/main/python/agent/Heartbeat.py | 6 +-
slider-agent/src/main/python/agent/Registry.py | 57 +
slider-agent/src/main/python/agent/main.py | 29 +-
slider-agent/src/main/python/kazoo/__init__.py | 1 +
slider-agent/src/main/python/kazoo/client.py | 1412 ++++++++++++++++++
.../src/main/python/kazoo/exceptions.py | 199 +++
.../src/main/python/kazoo/handlers/__init__.py | 1 +
.../src/main/python/kazoo/handlers/gevent.py | 161 ++
.../src/main/python/kazoo/handlers/threading.py | 287 ++++
.../src/main/python/kazoo/handlers/utils.py | 93 ++
slider-agent/src/main/python/kazoo/hosts.py | 26 +
.../src/main/python/kazoo/interfaces.py | 203 +++
.../src/main/python/kazoo/loggingsupport.py | 2 +
.../src/main/python/kazoo/protocol/__init__.py | 1 +
.../main/python/kazoo/protocol/connection.py | 623 ++++++++
.../src/main/python/kazoo/protocol/paths.py | 54 +
.../main/python/kazoo/protocol/serialization.py | 396 +++++
.../src/main/python/kazoo/protocol/states.py | 237 +++
.../src/main/python/kazoo/recipe/__init__.py | 1 +
.../src/main/python/kazoo/recipe/barrier.py | 214 +++
.../src/main/python/kazoo/recipe/counter.py | 94 ++
.../src/main/python/kazoo/recipe/election.py | 79 +
.../src/main/python/kazoo/recipe/lock.py | 520 +++++++
.../src/main/python/kazoo/recipe/partitioner.py | 377 +++++
.../src/main/python/kazoo/recipe/party.py | 118 ++
.../src/main/python/kazoo/recipe/queue.py | 321 ++++
.../src/main/python/kazoo/recipe/watchers.py | 419 ++++++
slider-agent/src/main/python/kazoo/retry.py | 150 ++
slider-agent/src/main/python/kazoo/security.py | 138 ++
.../src/main/python/kazoo/testing/__init__.py | 5 +
.../src/main/python/kazoo/testing/common.py | 283 ++++
.../src/main/python/kazoo/testing/harness.py | 180 +++
.../src/main/python/kazoo/tests/__init__.py | 0
.../src/main/python/kazoo/tests/test_barrier.py | 157 ++
.../src/main/python/kazoo/tests/test_build.py | 29 +
.../src/main/python/kazoo/tests/test_client.py | 1098 ++++++++++++++
.../main/python/kazoo/tests/test_connection.py | 319 ++++
.../src/main/python/kazoo/tests/test_counter.py | 35 +
.../main/python/kazoo/tests/test_election.py | 139 ++
.../main/python/kazoo/tests/test_exceptions.py | 22 +
.../python/kazoo/tests/test_gevent_handler.py | 160 ++
.../src/main/python/kazoo/tests/test_lock.py | 517 +++++++
.../main/python/kazoo/tests/test_partitioner.py | 92 ++
.../src/main/python/kazoo/tests/test_party.py | 84 ++
.../src/main/python/kazoo/tests/test_paths.py | 98 ++
.../src/main/python/kazoo/tests/test_queue.py | 179 +++
.../src/main/python/kazoo/tests/test_retry.py | 77 +
.../main/python/kazoo/tests/test_security.py | 40 +
.../kazoo/tests/test_threading_handler.py | 326 ++++
.../main/python/kazoo/tests/test_watchers.py | 489 ++++++
.../src/main/python/kazoo/tests/util.py | 126 ++
.../src/test/python/agent/TestHeartbeat.py | 12 +-
slider-agent/src/test/python/agent/TestMain.py | 16 +-
.../org/apache/slider/common/SliderKeys.java | 5 +
.../providers/AbstractProviderService.java | 18 +
.../slider/providers/ProviderService.java | 22 +
.../slider/providers/agent/AgentKeys.java | 2 +
.../providers/agent/AgentProviderService.java | 126 +-
.../server/appmaster/SliderAppMaster.java | 7 +
.../slider/server/appmaster/state/AppState.java | 8 +
.../appmaster/web/rest/agent/HeartBeat.java | 11 +
.../model/mock/MockProviderService.groovy | 12 +
.../agent/TestAgentProviderService.java | 26 +-
slider-core/src/test/python/agent/main.py | 5 +-
68 files changed, 10931 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/52248b79/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/52248b79/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java
----------------------------------------------------------------------