Merge branch 'feature/SLIDER-706_application_installation_failure_does_not_result_in_clear_failure_indication' 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/fb20aceb Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/fb20aceb Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/fb20aceb Branch: refs/heads/develop Commit: fb20aceb8cf1c8f0a24c0a50b76769dc565cef5e Parents: 18cdb00 19a6dfc Author: Steve Loughran <[email protected]> Authored: Fri Feb 6 17:39:38 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Fri Feb 6 17:39:38 2015 +0000 ---------------------------------------------------------------------- .../java/org/apache/slider/api/ClusterNode.java | 26 +++++++-- .../apache/slider/common/tools/SliderUtils.java | 19 +++++++ .../providers/agent/AgentProviderService.java | 60 ++++++++++---------- .../slider/server/appmaster/state/AppState.java | 12 ++-- .../appmaster/state/ProviderAppState.java | 6 ++ .../server/appmaster/state/RoleInstance.java | 35 ++++++++++++ .../state/StateAccessForProviders.java | 7 +++ .../agent/TestAgentProviderService.java | 21 +++++-- 8 files changed, 142 insertions(+), 44 deletions(-) ----------------------------------------------------------------------
