You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by iu...@apache.org on 2021/09/06 11:21:12 UTC

[brooklyn-server] branch master updated (4379e7e -> 936e88d)

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 4379e7e  Merge pull request #1246 from algairim/rest-resources-fixes
     add 8547fea  Revert "BROOKLYN-626: fix jmxmp"
     add 474a867  Added references for this change
     add 3dc983b  Merge pull request #1248 from iuliana/revert-1097-fix/BROOkLYN-626
     new 936e88d  Merge pull request #1247 from apache/revert-1097-fix/BROOkLYN-626

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:
 karaf/features/src/main/feature/feature.xml        |  1 +
 .../org/apache/brooklyn/feed/jmx/JmxHelper.java    | 24 +++++++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

[brooklyn-server] 01/01: Merge pull request #1247 from apache/revert-1097-fix/BROOkLYN-626

Posted by 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 936e88d87bdabc44ebc43cdc76675dd37e422aed
Merge: 4379e7e 3dc983b
Author: Iuliana Cosmina <iu...@cloudsoft.io>
AuthorDate: Mon Sep 6 12:21:08 2021 +0100

    Merge pull request #1247 from apache/revert-1097-fix/BROOkLYN-626
    
    Revert "BROOKLYN-626: fix jmxmp"

 karaf/features/src/main/feature/feature.xml        |  1 +
 .../org/apache/brooklyn/feed/jmx/JmxHelper.java    | 24 +++++++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)