Merge branch 'feature/SLIDER-171-slider-on-windows' 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/0317c411 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0317c411 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0317c411 Branch: refs/heads/develop Commit: 0317c411590e378ce8dc03e1b13b7eb1acd0ea32 Parents: 9a54a0b 853a979 Author: Steve Loughran <ste...@apache.org> Authored: Tue Jul 1 21:10:16 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Tue Jul 1 21:10:16 2014 +0100 ---------------------------------------------------------------------- .../slider/client/SliderYarnClientImpl.java | 3 +- .../apache/slider/common/tools/SliderUtils.java | 2 +- .../core/launch/ClasspathConstructor.java | 4 +- .../core/launch/JavaCommandLineBuilder.java | 2 +- .../funtest/framework/CommandTestBase.groovy | 4 +- .../funtest/framework/FileUploader.groovy | 30 ++++-- .../basic/TestClusterConnectivity.groovy | 96 ++++++++++++++++++++ .../lifecycle/TestAgentClusterLifecycle.groovy | 3 +- .../clusters/c6401/slider/slider-client.xml | 19 ++-- .../clusters/morzine/slider/log4j.properties | 83 +++++++++++++++++ .../clusters/morzine/slider/slider-client.xml | 76 ++++++++++++++++ .../clusters/offline/slider/slider-client.xml | 7 +- .../clusters/remote/slider/slider-client.xml | 5 - .../clusters/sandbox/slider/slider-client.xml | 5 - src/test/clusters/ubuntu-secure/operations.md | 36 ++++---- 15 files changed, 315 insertions(+), 60 deletions(-) ----------------------------------------------------------------------