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/12/07 15:00:07 UTC

[karaf] branch master updated (b4b4512 -> d1aadaa)

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 b4b4512  Merge pull request #686 from jbonofre/KARAF-6034
     add 336752a  [KARAF-5263] Add naming for encryption and shell:watch threads
     new d1aadaa  Merge pull request #688 from jbonofre/KARAF-5232

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:
 .../apache/karaf/jaas/modules/properties/AutoEncryptionSupport.java    | 3 ++-
 .../main/java/org/apache/karaf/shell/commands/impl/WatchAction.java    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)


[karaf] 01/01: Merge pull request #688 from jbonofre/KARAF-5232

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 d1aadaae064fb614b0a90a6239fd916dc342a428
Merge: b4b4512 336752a
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Fri Dec 7 15:59:58 2018 +0100

    Merge pull request #688 from jbonofre/KARAF-5232
    
    [KARAF-5263] Add naming for encryption and shell:watch threads

 .../apache/karaf/jaas/modules/properties/AutoEncryptionSupport.java    | 3 ++-
 .../main/java/org/apache/karaf/shell/commands/impl/WatchAction.java    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)