Merge branch 'feature/SLIDER-363_chaos_monkey_keeps_running_even_when_inactive' 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/fb22114c Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/fb22114c Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/fb22114c Branch: refs/heads/develop Commit: fb22114c0b9df42914c89065573253f4f7fb4fb9 Parents: 5730518 c2db9ed Author: Steve Loughran <ste...@apache.org> Authored: Tue Aug 26 18:28:07 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Tue Aug 26 18:28:07 2014 +0100 ---------------------------------------------------------------------- .../server/appmaster/SliderAppMaster.java | 25 +++++------ .../appmaster/monkey/ChaosMonkeyService.java | 46 ++++++++++++++++++-- .../model/monkey/TestMockMonkey.groovy | 41 ++++++++++++++--- 3 files changed, 90 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
