Merge branch 'feature/SLIDER-531-registry-enhancements' 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/a5c0d3b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a5c0d3b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a5c0d3b4 Branch: refs/heads/develop Commit: a5c0d3b41b20be92cc9a90072d368d7be6fa31a6 Parents: 96c9006 b51f581 Author: Steve Loughran <[email protected]> Authored: Sun Nov 2 14:25:26 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Sun Nov 2 14:25:26 2014 +0000 ---------------------------------------------------------------------- slider-agent/src/main/python/agent/Registry.py | 11 ++++++----- .../registry/info/CustomRegistryConstants.java | 20 ++++++++++---------- .../server/appmaster/SliderAppMaster.java | 3 +-- .../rest/registry/PathEntryMarshalling.groovy | 2 +- .../funtest/lifecycle/AgentRegistryIT.groovy | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
