Merge branch 'develop' into feature/SLIDER-1022-HTTPS
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/d7c44980 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/d7c44980 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/d7c44980 Branch: refs/heads/feature/SLIDER-1022_AM_to_support_HTTPS Commit: d7c44980371fa36a34227ec0d157984604ae328f Parents: a2619c8 9cb9661 Author: Steve Loughran <ste...@apache.org> Authored: Mon Dec 14 18:24:15 2015 +0000 Committer: Steve Loughran <ste...@apache.org> Committed: Mon Dec 14 18:24:15 2015 +0000 ---------------------------------------------------------------------- .../slider/server/appmaster/SliderAppMaster.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d7c44980/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java ----------------------------------------------------------------------
