This closes #561
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/83b27b32 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/83b27b32 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/83b27b32 Branch: refs/heads/master Commit: 83b27b320998288ab485b0ea4524de8612f78217 Parents: b0eff1a da18848 Author: Alex Heneveld <[email protected]> Authored: Fri Mar 20 17:09:23 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Fri Mar 20 17:09:23 2015 +0000 ---------------------------------------------------------------------- .../java/brooklyn/management/EntityManager.java | 2 +- .../rebind/InitialFullRebindIteration.java | 11 ++- .../ha/HighAvailabilityManagerImpl.java | 6 +- .../internal/EntityManagementSupport.java | 4 +- .../management/internal/LocalEntityManager.java | 77 +++++++++++++++++--- .../internal/LocalLocationManager.java | 25 ++++--- .../internal/ManagementTransitionInfo.java | 5 ++ .../ha/HighAvailabilityManagerInMemoryTest.java | 1 - .../java/brooklyn/rest/domain/ApiError.java | 48 +++++++++--- .../rest/filter/HaHotCheckResourceFilter.java | 17 +++-- .../rest/filter/HaMasterCheckFilter.java | 41 ++++++++--- .../brooklyn/rest/resources/ServerResource.java | 8 ++ .../brooklyn/rest/util/WebResourceUtils.java | 26 ++++++- 13 files changed, 210 insertions(+), 61 deletions(-) ----------------------------------------------------------------------
