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 cf1c70b19a3acdc61be98ee80483896f31fa1516 Merge: c32a56e faf9396 Author: Alex Heneveld <[email protected]> AuthorDate: Fri Oct 23 10:18:03 2020 +0100 This closes #1117 .../api/internal/AbstractBrooklynObjectSpec.java | 24 ++-- .../apache/brooklyn/api/objs/BrooklynObject.java | 14 ++- .../BrooklynComponentTemplateResolver.java | 18 ++- .../camp/brooklyn/spi/creation/CampResolver.java | 91 +++++++++------ .../CatalogOsgiVersionMoreEntityRebindTest.java | 5 + .../catalog/CatalogOsgiYamlEntityTest.java | 128 ++++++++++++++++++++- .../CatalogYamlEntityOsgiTypeRegistryTest.java | 29 ++++- .../brooklyn/catalog/CatalogYamlEntityTest.java | 18 ++- .../catalog/internal/BasicBrooklynCatalog.java | 6 +- .../core/catalog/internal/CatalogUtils.java | 7 +- .../org/apache/brooklyn/core/entity/Dumper.java | 4 +- .../brooklyn/core/mgmt/EntityManagementUtils.java | 26 ++++- .../brooklyn/core/mgmt/rebind/RebindIteration.java | 12 ++ .../core/mgmt/osgi/OsgiStandaloneTest.java | 1 + 14 files changed, 311 insertions(+), 72 deletions(-)
