You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/11/20 16:57:21 UTC
[3/3] incubator-slider git commit: Merge branch
'feature/SLIDER-659-am-suicide-npe' into develop
Merge branch 'feature/SLIDER-659-am-suicide-npe' 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/a0b00f0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a0b00f0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a0b00f0d
Branch: refs/heads/develop
Commit: a0b00f0d0a75c95f5de580865e817e392f4804ef
Parents: 81cd546 976c889
Author: Steve Loughran <st...@apache.org>
Authored: Wed Nov 19 16:34:52 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Nov 19 16:34:52 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/slider/client/SliderClusterOperations.java | 4 +++-
.../org/apache/slider/common/params/ActionAMSuicideArgs.java | 2 +-
.../java/org/apache/slider/server/appmaster/SliderAppMaster.java | 3 +++
3 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------