[brooklyn-server] branch master updated (b26173f -> d95cfbb)

[iu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

iuliana pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git.


    from b26173f  Merge pull request #1129 from grkvlt/value-resolver-test-race-fix
     new a7707db  change some common dull logged things to log debug
     new 3b23e35  for logback extensions, load the custom xml twice to allow it to override log categories defined later
     new 9fffdab  don't restrict recursive type coercion to parameterized types
     new a318aa6  bump down felix logging, it's only used in tests where normally it isn't that interesting
     new ab0e86d  much better logging and fewer false errors during catalog init
     new d95cfbb  Merge pull request #1130 from ahgittin/misc-tidies

The 12700 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../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 +-
 .../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 +
 20 files changed, 210 insertions(+), 117 deletions(-)