Merge branch 'develop' into feature/SLIDER-304_hdfs_token_renewal
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/c939ac60
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/c939ac60
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/c939ac60
Branch: refs/heads/develop
Commit: c939ac609fd9db1fa3c076ec64e9cf777124cbab
Parents: 0bd6c6c 38e6d34
Author: Jon Maron <[email protected]>
Authored: Wed Aug 27 14:16:05 2014 -0400
Committer: Jon Maron <[email protected]>
Committed: Wed Aug 27 14:16:05 2014 -0400
----------------------------------------------------------------------
app-packages/accumulo/README.txt | 28 +-
app-packages/accumulo/pom.xml | 5 +
.../slider/accumulo/CustomAuthenticator.java | 4 +-
app-packages/app-pkg-template/metainfo.xml | 8 +-
app-packages/hbase-win/README.txt | 34 ++
app-packages/hbase-win/appConfig.json | 44 +++
.../hbase-win/configuration/hbase-env.xml | 54 +++
.../hbase-win/configuration/hbase-log4j.xml | 143 +++++++
.../hbase-win/configuration/hbase-policy.xml | 53 +++
.../hbase-win/configuration/hbase-site.xml | 370 +++++++++++++++++++
app-packages/hbase-win/jmx_metrics.json | 56 +++
app-packages/hbase-win/metainfo.xml | 129 +++++++
...se-0.98.0.2.1.5.0-2047-hadoop2.zip.REPLACEME | 17 +
.../hbase-win/package/scripts/__init__.py | 19 +
.../hbase-win/package/scripts/functions.py | 40 ++
app-packages/hbase-win/package/scripts/hbase.py | 66 ++++
.../hbase-win/package/scripts/hbase_master.py | 63 ++++
.../package/scripts/hbase_regionserver.py | 63 ++++
.../hbase-win/package/scripts/hbase_service.py | 48 +++
.../hbase-win/package/scripts/params.py | 81 ++++
.../hbase-win/package/scripts/status_params.py | 26 ++
.../package/templates/hbase_client_jaas.conf.j2 | 22 ++
.../package/templates/hbase_master_jaas.conf.j2 | 25 ++
.../templates/hbase_regionserver_jaas.conf.j2 | 25 ++
app-packages/hbase-win/resources.json | 21 ++
app-packages/hbase/appConfig.json | 3 +-
app-packages/hbase/package/scripts/hbase.py | 2 +
app-packages/memcached-win/appConfig.json | 6 +-
app-packages/memcached-win/metainfo.xml | 8 +-
app-packages/memcached/metainfo.xml | 8 +-
slider-agent/src/main/python/agent/Constants.py | 1 +
.../src/main/python/agent/Controller.py | 1 -
slider-agent/src/main/python/agent/Registry.py | 9 +-
slider-agent/src/main/python/agent/main.py | 60 +--
slider-agent/src/main/python/kazoo/client.py | 6 +-
.../src/main/python/kazoo/handlers/threading.py | 6 +-
.../src/main/python/kazoo/handlers/utils.py | 87 ++++-
.../main/python/kazoo/protocol/connection.py | 16 +-
.../src/main/python/kazoo/tests/test_client.py | 6 +-
.../main/python/kazoo/tests/test_connection.py | 55 +--
.../core/providers/__init__.py | 14 +-
.../core/providers/windows/system.py | 74 +++-
.../core/providers/windows/tarball.py | 46 +++
.../libraries/functions/check_process_status.py | 44 ++-
.../libraries/script/script.py | 2 +-
slider-agent/src/test/python/agent/TestMain.py | 19 +-
slider-assembly/pom.xml | 8 +-
.../providers/agent/AgentProviderService.java | 5 +
.../server/appmaster/SliderAppMaster.java | 25 +-
.../appmaster/monkey/ChaosMonkeyService.java | 46 ++-
.../model/monkey/TestMockMonkey.groovy | 41 +-
.../failures/TestKilledHBaseAM.groovy | 1 -
52 files changed, 1880 insertions(+), 163 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c939ac60/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
----------------------------------------------------------------------
