You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by go...@apache.org on 2016/03/16 21:58:22 UTC
[31/50] incubator-slider git commit: Merge branch
'feature/SLIDER-1077-oozie' into develop
Merge branch 'feature/SLIDER-1077-oozie' 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/b6b3e627
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b6b3e627
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b6b3e627
Branch: refs/heads/feature/SLIDER-906_docker_support
Commit: b6b3e627603f01b08de8cd6e458df72b987aac72
Parents: 8d4da2d 031d88a
Author: Steve Loughran <st...@apache.org>
Authored: Wed Feb 3 19:41:16 2016 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Feb 3 19:41:16 2016 +0000
----------------------------------------------------------------------
.../org/apache/slider/client/SliderClient.java | 48 ++-
.../slider/client/SliderYarnClientImpl.java | 2 +-
.../apache/slider/client/TokensOperation.java | 109 ++++++
.../org/apache/slider/common/Constants.java | 2 +-
.../apache/slider/common/SliderXmlConfKeys.java | 2 +-
.../slider/common/params/ActionTokensArgs.java | 78 ++++
.../apache/slider/common/params/Arguments.java | 1 +
.../apache/slider/common/params/ClientArgs.java | 21 +-
.../slider/common/params/SliderActions.java | 16 +-
.../apache/slider/common/tools/SliderUtils.java | 65 ++--
.../slider/core/launch/AbstractLauncher.java | 68 ++--
.../slider/core/launch/AppMasterLauncher.java | 85 +----
.../slider/core/launch/ContainerLauncher.java | 8 +-
.../slider/core/launch/CredentialUtils.java | 361 +++++++++++++++++++
.../server/appmaster/RoleLaunchService.java | 21 +-
.../server/appmaster/SliderAppMaster.java | 111 +++---
.../client/TestSliderTokensCommand.groovy | 129 +++++++
.../apache/slider/test/SliderTestUtils.groovy | 20 +-
.../core/launch/TestAppMasterLauncher.java | 6 +-
.../TestAppMasterLauncherWithAmReset.java | 4 +-
.../funtest/framework/CommandTestBase.groovy | 4 +
.../funtest/commands/KDiagCommandIT.groovy | 2 +-
22 files changed, 928 insertions(+), 235 deletions(-)
----------------------------------------------------------------------