[brooklyn-server] branch master updated (47dfe1c -> e8cbd29)

[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 47dfe1c  This closes #1252
     add 00c9e94  Fix path to tomcat icons on apache.org
     new e8cbd29  Merge pull request #1254 from apache/fix/tomcat-icon-path

The 1 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:
 .../src/test/resources/test-framework-examples/example-catalog-test.bom | 2 +-
 .../src/test/resources/test-framework-examples/example-catalog.bom      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[brooklyn-server] 01/01: Merge pull request #1254 from apache/fix/tomcat-icon-path

[iu...@apache.org]

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

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

commit e8cbd296ef12e06200bb4322297b687674b70a14
Merge: 47dfe1c 00c9e94
Author: Iuliana Cosmina <iu...@cloudsoft.io>
AuthorDate: Wed Sep 8 16:52:50 2021 +0100

    Merge pull request #1254 from apache/fix/tomcat-icon-path
    
    Fix path to tomcat icons on apache.org

 .../src/test/resources/test-framework-examples/example-catalog-test.bom | 2 +-
 .../src/test/resources/test-framework-examples/example-catalog.bom      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)