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 2015/11/12 19:15:26 UTC
[11/12] incubator-slider git commit: Merge branch 'develop' into
feature/SLIDER-82-pass-3.1
Merge branch 'develop' into feature/SLIDER-82-pass-3.1
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/6b13042c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6b13042c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6b13042c
Branch: refs/heads/feature/SLIDER-82-pass-3.1
Commit: 6b13042c66c0f8d0914ee18f9abddd170f6ef512
Parents: 4754088 b201de8
Author: Steve Loughran <st...@apache.org>
Authored: Thu Nov 12 14:02:33 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Nov 12 14:02:33 2015 +0000
----------------------------------------------------------------------
pom.xml | 8 ++++++--
.../slider/server/appmaster/SliderAppMaster.java | 2 +-
.../server/appmaster/monkey/ChaosKillContainer.java | 16 +++++++---------
3 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6b13042c/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
----------------------------------------------------------------------