Merge branch 'feature/SLIDER-907-certificate-trust' 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/fe4abc04 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/fe4abc04 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/fe4abc04 Branch: refs/heads/develop Commit: fe4abc042fec9bb690cef8fc748956d26e640d1e Parents: 1742ab2 c14eb35 Author: Steve Loughran <[email protected]> Authored: Mon Dec 14 17:43:08 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Mon Dec 14 17:43:08 2015 +0000 ---------------------------------------------------------------------- .../apache/slider/core/conf/MapOperations.java | 17 ++++ .../core/launch/JavaCommandLineBuilder.java | 33 +++++- .../server/appmaster/SliderAppMaster.java | 100 +++++++++++++------ .../appmaster/actions/ActionStopSlider.java | 16 ++- .../slider/server/appmaster/state/AppState.java | 32 +----- .../slider/core/conf/TestConfTreeResolve.groovy | 12 ++- .../apache/slider/test/SliderTestBase.groovy | 4 +- 7 files changed, 144 insertions(+), 70 deletions(-) ----------------------------------------------------------------------
