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
----------------------------------------------------------------------

Reply via email to