This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git

commit 0ec043260d368c729725114e46a9bc77c28f3d90
Merge: b1fc234 8fd575b
Author: zan-mateusz <mateusz....@cloudsoftcorp.com>
AuthorDate: Fri Jul 16 18:55:16 2021 +0100

    Merge branch 'feature/working-peristence-import-api' of 
github.com:zan-mateusz/brooklyn-server into 
feature/working-peristence-import-api

 .../api/mgmt/ha/HighAvailabilityManager.java       |   5 +
 .../core/effector/AddDeploySensorsInitializer.java |  52 +++++++++++
 .../core/mgmt/ha/HighAvailabilityManagerImpl.java  |  61 +++++++++----
 .../internal/NonDeploymentManagementContext.java   |   4 +
 .../BrooklynMementoPersisterToObjectStore.java     |   1 -
 .../mgmt/persist/BrooklynPersistenceUtils.java     |  29 ------
 .../mgmt/rebind/PeriodicDeltaChangeListener.java   |   9 --
 .../core/objs/proxy/InternalEntityFactory.java     | 101 ++++++++++++++-------
 .../org/apache/brooklyn/rest/api/ServerApi.java    |   7 ++
 .../rest/domain/HighAvailabilitySummary.java       |   8 +-
 .../brooklyn/rest/resources/ServerResource.java    |  11 +++
 .../transform/HighAvailabilityTransformer.java     |   2 +-
 12 files changed, 200 insertions(+), 90 deletions(-)

Reply via email to