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 2018/07/29 20:10:04 UTC

[karaf] branch karaf-4.1.x updated (9250a76 -> c939a2a)

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

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


    from 9250a76  Fix manual parent version
     add 94e75c6  [KARAF-5781] Properties edit doesn't conserve the existing ones
     new c939a2a  Merge pull request #544 from vanSabben/KARAF-5781

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


[karaf] 01/01: Merge pull request #544 from vanSabben/KARAF-5781

Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit c939a2a2c47c729c21766eeec4b372a313f64dfc
Merge: 9250a76 94e75c6
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Sun Jul 29 22:10:00 2018 +0200

    Merge pull request #544 from vanSabben/KARAF-5781
    
    [KARAF-5781] Properties edit doesn't conserve the existing ones. (On karaf-4.1.x)

 .../java/org/apache/karaf/profile/assembly/Builder.java  | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)