Merge branch 'develop' into feature/SLIDER-509-registry-funtests
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/87987a53 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/87987a53 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/87987a53 Branch: refs/heads/develop Commit: 87987a53737d30d91d933a98fbe14aac11b93a4f Parents: 5df53ea d08a61d Author: Steve Loughran <[email protected]> Authored: Tue Oct 14 10:55:13 2014 -0700 Committer: Steve Loughran <[email protected]> Committed: Tue Oct 14 10:55:13 2014 -0700 ---------------------------------------------------------------------- app-packages/accumulo/appConfig-default.json | 43 +++++++--- .../accumulo/configuration/accumulo-env.xml | 89 ++++++++++++++++++++ app-packages/accumulo/configuration/client.xml | 44 ++++++++++ app-packages/accumulo/configuration/global.xml | 89 -------------------- app-packages/accumulo/metainfo.xml | 10 +++ .../package/scripts/accumulo_configuration.py | 14 ++- app-packages/accumulo/package/scripts/params.py | 33 +++++--- .../accumulo/package/templates/client.conf.j2 | 18 ---- app-packages/accumulo/resources-default.json | 4 +- .../accumulo/AccumuloMonitorSSLIT.groovy | 1 - .../AccumuloMonitorSSLLocalCertsIT.groovy | 72 ++++++++++++++++ .../funtest/accumulo/AccumuloReadWriteIT.groovy | 2 +- .../accumulo/AccumuloReadWriteSSLIT.groovy | 2 +- .../funtest/accumulo/AccumuloSSLTestBase.groovy | 5 +- .../slider/core/launch/AbstractLauncher.java | 3 +- .../server/appmaster/SliderAppMaster.java | 3 +- .../core/launch/TestAppMasterLauncher.java | 8 +- .../funtest/lifecycle/AgentFailures2IT.groovy | 12 ++- 18 files changed, 292 insertions(+), 160 deletions(-) ----------------------------------------------------------------------
