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 16c532ce1def805e49644801f3e963dddb8a732d Merge: e714eca10c 9039ea97a3 Author: Alex Heneveld <[email protected]> AuthorDate: Thu Jul 14 11:16:22 2022 +0100 Merge branch 'fix-import-state-bundle-order' .../catalog/internal/BasicBrooklynCatalog.java | 5 +- .../catalog/internal/CatalogInitialization.java | 74 +++++---- .../apache/brooklyn/core/mgmt/ha/OsgiManager.java | 11 +- .../brooklyn/core/mgmt/rebind/RebindIteration.java | 73 +++++---- .../BrooklynBomYamlCatalogBundleResolver.java | 3 +- .../util/core/logbook/file/FileLogStoreTest.java | 17 +- .../brooklyn/rest/resources/ServerResource.java | 46 +++--- .../rest/resources/ApplicationResourceTest.java | 10 +- .../resources/ServerExportImportResourceTest.java | 177 +++++++++++++++++++++ .../rest/resources/ServerResourceTest.java | 44 ++--- 10 files changed, 339 insertions(+), 121 deletions(-)
