Merge branch 'develop' into feature/SLIDER-280_Restart_AM_fun_tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f8c21c7b Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f8c21c7b Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f8c21c7b Branch: refs/heads/feature/SLIDER-280_Restart_AM_fun_tests Commit: f8c21c7b30f851bea0e422938dd432eed7b4f344 Parents: 278d5e4 bff5ed6 Author: Sumit Mohanty <[email protected]> Authored: Mon Sep 8 14:24:43 2014 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Mon Sep 8 14:24:43 2014 -0700 ---------------------------------------------------------------------- app-packages/accumulo/appConfig.json | 2 + .../src/test/resources/appConfig_kerberos.json | 2 + .../test/resources/appConfig_monitor_ssl.json | 2 + .../src/test/resources/appConfig_ssl.json | 2 + app-packages/hbase/appConfig.json | 8 ++-- app-packages/storm/README.txt | 19 ++++---- app-packages/storm/appConfig.json | 5 ++- app-packages/storm/metainfo.xml | 2 +- app-packages/storm/package/scripts/params.py | 8 ++-- app-packages/storm/package/scripts/service.py | 47 ++++++++------------ app-packages/storm/package/scripts/storm.py | 9 ++-- .../storm/package/scripts/yaml_config.py | 10 ++++- .../storm/package/templates/storm_jaas.conf.j2 | 11 ++--- app-packages/storm/resources.json | 2 +- pom.xml | 12 ++--- slider-agent/pom.xml | 4 +- slider-agent/src/main/python/setup.py | 2 +- slider-agent/src/test/python/python-wrap | 40 ----------------- slider-agent/src/test/python/python-wrap.sh | 42 +++++++++++++++++ slider-agent/src/test/python/unitTests.py | 36 +++++++-------- slider-assembly/pom.xml | 23 +++++++++- slider-assembly/src/main/scripts/slider | 2 + slider-assembly/src/main/scripts/slider.py | 10 +++-- slider-core/pom.xml | 4 +- .../slider/providers/agent/AgentKeys.java | 1 + .../providers/agent/AgentProviderService.java | 39 ++++++++++++---- .../standalone/TestStandaloneAMKill.groovy | 2 +- .../apache/slider/test/SliderTestUtils.groovy | 2 +- .../slider/test/YarnMiniClusterTestBase.groovy | 4 +- .../agent/TestAgentProviderService.java | 29 ++++++++++++ 30 files changed, 231 insertions(+), 150 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f8c21c7b/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java ----------------------------------------------------------------------
