Merge branch 'feature/SLIDER-333_add_one_way_port_to_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/1057db53 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1057db53 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1057db53 Branch: refs/heads/feature/SLIDER-151_REST_API Commit: 1057db5312873f36e71fccb93b9eec918389ec4c Parents: d91797b 8737cf1 Author: Jon Maron <jma...@hortonworks.com> Authored: Wed Aug 20 10:00:38 2014 -0400 Committer: Jon Maron <jma...@hortonworks.com> Committed: Wed Aug 20 10:00:38 2014 -0400 ---------------------------------------------------------------------- .../src/main/python/agent/Controller.py | 2 +- slider-agent/src/main/python/agent/Registry.py | 12 ++++-- slider-agent/src/main/python/agent/main.py | 7 +++- .../java/org/apache/slider/api/StatusKeys.java | 7 ++-- .../registry/info/CustomRegistryConstants.java | 9 +++-- .../providers/AbstractProviderService.java | 9 +++-- .../slider/providers/ProviderService.java | 10 +++-- .../providers/agent/AgentProviderService.java | 23 ++++++----- .../slideram/SliderAMProviderService.java | 19 +++++----- .../server/appmaster/SliderAppMaster.java | 40 +++++++++++--------- .../agent/TestAgentAMManagementWS.groovy | 2 +- .../model/mock/MockProviderService.groovy | 4 +- .../providers/hbase/HBaseProviderService.java | 10 +++-- 13 files changed, 92 insertions(+), 62 deletions(-) ----------------------------------------------------------------------
