Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/be1174cb Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/be1174cb Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/be1174cb Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: be1174cb310ea86e4fecdc573615c06ae727dbfb Parents: 6cac8a5 cbe2dd1 Author: Steve Loughran <[email protected]> Authored: Tue Aug 26 18:31:23 2014 +0100 Committer: Steve Loughran <[email protected]> Committed: Tue Aug 26 18:31:23 2014 +0100 ---------------------------------------------------------------------- app-packages/accumulo/README.txt | 28 ++++++++++-- app-packages/accumulo/pom.xml | 5 +++ .../server/appmaster/SliderAppMaster.java | 25 +++++------ .../appmaster/monkey/ChaosMonkeyService.java | 46 ++++++++++++++++++-- .../model/monkey/TestMockMonkey.groovy | 41 ++++++++++++++--- 5 files changed, 120 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/be1174cb/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java ----------------------------------------------------------------------
