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 e5da7634ea02926396fe9bc4902c9cde2c8778c2 Merge: 90844d2 5dfe203 Author: Alex Heneveld <[email protected]> AuthorDate: Mon Oct 4 12:21:24 2021 +0100 Merge branch 'misc-updates' .../mgmt/rebind/mementos/ManagedBundleMemento.java | 4 +++ .../brooklyn/api/typereg/OsgiBundleWithUrl.java | 4 +++ .../brooklyn/camp/brooklyn/AbstractYamlTest.java | 2 +- .../brooklyn/camp/brooklyn/ConfigYamlTest.java | 33 ++++++++++++++++++++++ .../camp/brooklyn/test/lite/CampYamlLiteTest.java | 2 +- .../core/catalog/internal/CatalogBundleDto.java | 14 ++++++++- .../catalog/internal/CatalogItemDtoAbstract.java | 3 +- .../org/apache/brooklyn/core/config/Sanitizer.java | 26 +++++++++++++++++ .../apache/brooklyn/core/mgmt/ha/OsgiManager.java | 5 ++++ .../core/mgmt/internal/LocalEntityManager.java | 19 +++++++------ .../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 ++ .../brooklyn/core/server/BrooklynServerConfig.java | 2 ++ .../core/typereg/AbstractTypePlanTransformer.java | 31 ++++++++++++++++---- .../core/typereg/BasicBrooklynTypeRegistry.java | 2 +- .../brooklyn/core/typereg/BasicManagedBundle.java | 27 +++++++++++++----- .../core/typereg/BasicOsgiBundleWithUrl.java | 16 +++++++++-- .../BrooklynBomYamlCatalogBundleResolver.java | 4 +-- .../typereg/BrooklynCatalogBundleResolver.java | 7 +++++ .../typereg/BrooklynCatalogBundleResolvers.java | 5 ++-- .../util/core/logbook/DelegatingLogStore.java | 4 +-- .../brooklyn/util/core/logbook/LogbookConfig.java | 2 +- .../util/core/logbook/file/FileLogStore.java | 6 ++++ .../util/core/task/BasicExecutionManager.java | 11 ++------ .../apache/brooklyn/util/core/task/BasicTask.java | 30 +++++++++++++++++++- .../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 +++++++++++----- 32 files changed, 284 insertions(+), 79 deletions(-)
