You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@brooklyn.apache.org by he...@apache.org on 2022/06/27 14:36:40 UTC

[brooklyn-server] 01/03: Merge branch 'fix-persistence-deletion-race'

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 9ebb92de0392b98f91bffa8e1fb8610633ca38db
Merge: dcc6a42b54 5cd59cca8a
Author: Alex Heneveld <al...@cloudsoft.io>
AuthorDate: Mon Jun 27 15:36:02 2022 +0100

    Merge branch 'fix-persistence-deletion-race'

 .../apache/brooklyn/api/objs/EntityAdjunct.java    |   4 +-
 .../brooklyn/DynamicMultiGroupYamlRebindTest.java  | 173 ++++++++++++++++++++
 .../brooklyn/core/entity/AbstractEntity.java       |  27 +++-
 .../org/apache/brooklyn/core/entity/Entities.java  |  33 +++-
 .../brooklyn/core/entity/EntityAdjuncts.java       |  25 ++-
 .../internal/AsyncCollectionChangeAdapter.java     |  21 ++-
 .../mgmt/internal/CollectionChangeListener.java    |   6 +
 .../mgmt/internal/EntityManagementSupport.java     |   7 +-
 .../core/mgmt/internal/LocalEntityManager.java     | 179 ++++++++++++++++-----
 .../BrooklynMementoPersisterToObjectStore.java     |  60 +++++--
 .../mgmt/rebind/PeriodicDeltaChangeListener.java   |  30 +++-
 .../core/objs/proxy/InternalEntityFactory.java     |   3 +
 .../brooklyn/entity/group/DynamicGroupImpl.java    |  10 +-
 .../brooklyn/util/core/json/BidiSerialization.java |  27 ++--
 14 files changed, 508 insertions(+), 97 deletions(-)