You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@brooklyn.apache.org by he...@apache.org on 2021/04/15 10:13:18 UTC

[brooklyn-server] 03/03: Merge branch 'icons'

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 09533d81f2346aab864956fce45cd8e0ad2cdff5
Merge: 7118a83 956ad15
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Thu Apr 15 11:13:07 2021 +0100

    Merge branch 'icons'

 .../CatalogYamlEntityOsgiTypeRegistryTest.java     | 27 +++++++++++++++++++++-
 .../mgmt/internal/AbstractManagementContext.java   | 10 +++++---
 .../apache/brooklyn/util/core/ResourceUtils.java   |  6 +++++
 .../brooklyn/rest/resources/TypeResource.java      |  2 +-
 .../rest/resources/BundleAndTypeResourcesTest.java | 10 +++++++-
 5 files changed, 49 insertions(+), 6 deletions(-)