Merge branch 'feature/SLIDER-478_agent_ZK_bindings_to_move_to_YARN_registry' 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/3dc5abf9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/3dc5abf9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/3dc5abf9 Branch: refs/heads/develop Commit: 3dc5abf96ceb58cb63ab8c8bcf1d10de416466c3 Parents: 7559f3f 27bea60 Author: Steve Loughran <ste...@apache.org> Authored: Fri Oct 10 17:09:36 2014 -0700 Committer: Steve Loughran <ste...@apache.org> Committed: Fri Oct 10 17:09:36 2014 -0700 ---------------------------------------------------------------------- .../apache/slider/common/SliderXmlConfKeys.java | 5 +- .../slider/core/launch/AbstractLauncher.java | 8 ++ .../providers/AbstractProviderService.java | 4 + .../providers/agent/AgentProviderService.java | 25 ++--- .../server/appmaster/SliderAppMaster.java | 25 +++-- .../YarnRegistryViewForProviders.java | 100 +++++++++++++++--- .../model/mock/MockRegistryOperations.groovy | 101 +++++++++++++++++++ .../agent/TestAgentProviderService.java | 79 +++++++++++---- 8 files changed, 288 insertions(+), 59 deletions(-) ----------------------------------------------------------------------