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 155cb0325481200fefbda6bd77f19ef5b3f25b7b Merge: 672841e f689b81 Author: Alex Heneveld <[email protected]> AuthorDate: Mon Oct 4 12:17:10 2021 +0100 Merge pull request #8 from cloudsoft/fix-catalog-deletion-bundles-and-transient Fix catalog deletion bundles and transient .../mgmt/rebind/mementos/ManagedBundleMemento.java | 4 +++ .../brooklyn/api/typereg/OsgiBundleWithUrl.java | 4 +++ .../brooklyn/camp/brooklyn/AbstractYamlTest.java | 2 +- .../camp/brooklyn/test/lite/CampYamlLiteTest.java | 2 +- .../core/catalog/internal/CatalogBundleDto.java | 14 ++++++++- .../catalog/internal/CatalogItemDtoAbstract.java | 3 +- .../apache/brooklyn/core/mgmt/ha/OsgiManager.java | 5 ++++ .../brooklyn/core/mgmt/rebind/RebindIteration.java | 2 +- .../core/mgmt/rebind/RebindManagerImpl.java | 33 ++++++++++------------ .../mgmt/rebind/dto/BasicManagedBundleMemento.java | 19 +++++++++++-- .../core/mgmt/rebind/dto/MementosGenerators.java | 2 ++ .../core/typereg/BasicBrooklynTypeRegistry.java | 2 +- .../brooklyn/core/typereg/BasicManagedBundle.java | 27 +++++++++++++----- .../core/typereg/BasicOsgiBundleWithUrl.java | 16 +++++++++-- .../BrooklynBomYamlCatalogBundleResolver.java | 4 +-- .../typereg/BrooklynCatalogBundleResolver.java | 7 +++++ .../apache/brooklyn/rest/domain/BundleSummary.java | 11 ++++++-- .../brooklyn/rest/resources/BundleResource.java | 2 +- .../brooklyn/rest/resources/CatalogResource.java | 7 ++++- .../brooklyn/rest/resources/LocationResource.java | 3 ++ .../brooklyn/rest/resources/ServerResource.java | 25 +++++++++++----- 21 files changed, 144 insertions(+), 50 deletions(-)
