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

Posted to commits@karaf.apache.org by jb...@apache.org on 2024/03/28 13:47:29 UTC

(karaf) branch main updated (d111ee4b8b -> 638e3ae8d2)

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

jbonofre pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git


    from d111ee4b8b Merge pull request #1822 from awrb/KARAF-7804
     add 2e417d0889 [KARAF-7799] Allow merging of org.apache.karaf.features.xml definitions
     new 638e3ae8d2 Merge pull request #1818 from grgrzybek/KARAF-7799-main

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:
 .../org/apache/karaf/profile/assembly/Builder.java | 30 ++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

(karaf) 01/01: Merge pull request #1818 from grgrzybek/KARAF-7799-main

Posted by jb...@apache.org.

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

jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git

commit 638e3ae8d24eb16b6ec76ba9469bd1607f7374e4
Merge: d111ee4b8b 2e417d0889
Author: JB Onofré <jb...@apache.org>
AuthorDate: Thu Mar 28 14:47:24 2024 +0100

    Merge pull request #1818 from grgrzybek/KARAF-7799-main
    
    [KARAF-7799] Allow merging of org.apache.karaf.features.xml definitions

 .../org/apache/karaf/profile/assembly/Builder.java | 30 ++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)