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/3ed76a5c Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/3ed76a5c Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/3ed76a5c Branch: refs/heads/feature/SLIDER-481_allow_dedicated_handling_of_exports Commit: 3ed76a5cc6db20fd04b21a9fd4fb26e6e2a342e7 Parents: 2850539 6c43743 Author: tedyu <[email protected]> Authored: Mon Oct 13 16:49:18 2014 -0700 Committer: tedyu <[email protected]> Committed: Mon Oct 13 16:49:18 2014 -0700 ---------------------------------------------------------------------- .../funtest/accumulo/AccumuloReadWriteIT.groovy | 4 +- .../accumulo/AccumuloReadWriteSSLIT.groovy | 4 +- .../memcached-win/package/scripts/memcached.py | 1 - .../memcached/package/scripts/memcached.py | 1 - .../storm-win/package/scripts/service.py | 1 - app-packages/storm/package/scripts/service.py | 9 +-- .../core/providers/system.py | 28 +++++---- .../TestDirectoryResource.py | 8 +-- .../resource_management/TestFileResource.py | 10 +-- .../org/apache/slider/client/SliderClient.java | 4 +- .../apache/slider/common/SliderXmlConfKeys.java | 2 +- .../slider/common/tools/ConfigHelper.java | 20 +++++- .../utility/AbstractSliderLaunchedService.java | 13 ++-- .../slider/common/tools/TestConfigHelper.groovy | 65 ++++++++++++++++++++ .../common/tools/TestConfigHelperHDFS.groovy | 20 ------ .../test/YarnZKMiniClusterTestBase.groovy | 2 +- .../agent/TestAgentProviderService.java | 13 ++-- .../funtest/framework/CommandTestBase.groovy | 5 +- .../funtest/basic/ClusterConnectivityIT.groovy | 4 +- .../lifecycle/ClusterBuildDestroyIT.groovy | 4 +- .../accumulo/funtest/AccumuloCIIT.groovy | 4 +- .../funtest/FunctionalHBaseClusterIT.groovy | 4 +- .../funtest/HBaseClusterBuildDestroyIT.groovy | 4 +- 23 files changed, 149 insertions(+), 81 deletions(-) ----------------------------------------------------------------------
