[brooklyn-server] branch master updated (867fe7d -> 51762ba)

[du...@apache.org]

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

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


    from 867fe7d  This closes #1124
     new 97237d7  guard against and better error messages for some failure cases
     new da99936  analyse boms being installed when scoring them, good score if it has a catalog.bom, otherwise a lower score
     new a1c50d5  use bundle resolver scores better to return better errors
     new 51762ba  Merge pull request #1125 from ahgittin/misc-serial

The 12681 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:
 .../spi/dsl/methods/BrooklynDslCommon.java         |  4 ++
 .../core/catalog/internal/CatalogUtils.java        |  8 ++-
 .../mgmt/ha/BrooklynBomOsgiArchiveInstaller.java   |  6 ++
 .../apache/brooklyn/core/mgmt/ha/OsgiManager.java  |  6 +-
 .../core/resolve/jackson/WrappedValue.java         |  7 +++
 .../jackson/WrappedValuesSerialization.java        |  7 ++-
 .../typereg/AbstractCatalogBundleResolver.java     | 73 +++++++++++++++++++++-
 .../BrooklynBomBundleCatalogBundleResolver.java    | 10 ++-
 .../typereg/BrooklynCatalogBundleResolver.java     |  9 ++-
 .../typereg/BrooklynCatalogBundleResolvers.java    | 71 +++++++++++++--------
 .../rest/resources/CatalogResourceTest.java        | 12 ++--
 .../main/java/org/apache/brooklyn/util/os/Os.java  | 17 +++++
 .../apache/brooklyn/util/text/WildcardGlobs.java   |  6 +-
 13 files changed, 192 insertions(+), 44 deletions(-)