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 2017/10/23 11:45:36 UTC

[karaf] branch master updated (e1f59ca -> 2cd5165)

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

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


    from e1f59ca  [KARAF-5411] Format user prompt. This closes #382
     add 7fb0a65  [KARAF-5440] Allow for overrides to values in system.properties.
     new 2cd5165  Merge pull request #386 from worldprogramming/KARAF-5440

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:
 .../base/src/main/resources/resources/etc/system.properties |  3 +++
 .../src/main/resources/resources/etc/system.properties      |  3 +++
 .../apache/karaf/instance/resources/etc/system.properties   |  3 +++
 .../java/org/apache/karaf/util/config/PropertiesLoader.java | 13 ++++++++-----
 4 files changed, 17 insertions(+), 5 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@karaf.apache.org" <co...@karaf.apache.org>'].

[karaf] 01/01: Merge pull request #386 from worldprogramming/KARAF-5440

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

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

commit 2cd51653d61c30e483bd95f444b2a19f7932c86e
Merge: e1f59ca 7fb0a65
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Mon Oct 23 13:45:34 2017 +0200

    Merge pull request #386 from worldprogramming/KARAF-5440
    
    [KARAF-5440] Allow for overrides to values in system.properties.

 .../base/src/main/resources/resources/etc/system.properties |  3 +++
 .../src/main/resources/resources/etc/system.properties      |  3 +++
 .../apache/karaf/instance/resources/etc/system.properties   |  3 +++
 .../java/org/apache/karaf/util/config/PropertiesLoader.java | 13 ++++++++-----
 4 files changed, 17 insertions(+), 5 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@karaf.apache.org" <co...@karaf.apache.org>.