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/08 05:18:03 UTC

[karaf] 01/01: Merge pull request #674 from jbonofre/KARAF-5942

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 ae9d6361b6710e8b3d762bfc2814a1f7db6267e9
Merge: 7d84a55 f87b65b
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Sat Dec 8 06:17:57 2018 +0100

    Merge pull request #674 from jbonofre/KARAF-5942
    
    [KARAF-5942][KARAF-5943] Update to Aries Blueprint Core 1.10.1 & Aries Blueprint CM 1.3.1

 .../jasypt/handler/EncryptablePropertyPlaceholder.java       | 12 ++++++++++--
 pom.xml                                                      |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)