Merge branch 'feature/SLIDER-1010-kerberos-warning-in-AM' 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/6da1533b Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6da1533b Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6da1533b Branch: refs/heads/develop Commit: 6da1533b667de7148f3f23405d921f01248eb9b1 Parents: 058e64d d42242b Author: Steve Loughran <[email protected]> Authored: Wed Dec 9 17:47:23 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Wed Dec 9 17:47:23 2015 +0000 ---------------------------------------------------------------------- .../java/org/apache/slider/server/appmaster/SliderAppMaster.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
