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 47f95cc9f413bbd45e835701bd487d1db198ca19 Merge: fe07aeb d95cfbb Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com> AuthorDate: Thu Dec 3 09:00:28 2020 +0000 Merge branch 'master' into location-machine-start-stop-reboot-metrics-interface .../brooklyn/api/catalog/BrooklynCatalog.java | 3 + .../BrooklynAssemblyTemplateInstantiator.java | 9 +- .../creation/BrooklynEntityDecorationResolver.java | 8 +- .../spi/creation/BrooklynYamlTypeInstantiator.java | 9 +- .../camp/brooklyn/spi/creation/CampResolver.java | 6 +- .../spi/dsl/methods/BrooklynDslCommon.java | 6 +- .../catalog/internal/BasicBrooklynCatalog.java | 158 ++++++++++----------- .../core/catalog/internal/CatalogBundleLoader.java | 2 +- .../core/location/BasicLocationRegistry.java | 9 +- .../brooklyn/core/plan/PlanToSpecFactory.java | 9 +- .../entity/DelegatingEntitySpecResolver.java | 5 +- .../core/typereg/AbstractTypePlanTransformer.java | 10 +- .../core/typereg/BasicBrooklynTypeRegistry.java | 21 ++- .../brooklyn/core/typereg/RegisteredTypes.java | 2 +- .../core/typereg/TypePlanTransformers.java | 11 +- .../core/flags/BrooklynTypeNameResolution.java | 12 +- .../brooklyn/util/core/task/ValueResolverTest.java | 13 +- .../javalang/coerce/TypeCoercerExtensible.java | 5 +- .../org/apache/brooklyn/util/text/Strings.java | 16 +++ .../brooklyn/rt/felix/EmbeddedFelixFramework.java | 23 ++- .../src/main/resources/logback-test.xml | 3 + 21 files changed, 218 insertions(+), 122 deletions(-)