[karaf] 01/01: Merge pull request #627 from jbonofre/KARAF-5947

[jbonofre]

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 997e4ffabbe1421de5eee6adc56596126c79d43a
Merge: 5008f60 b52cc4f
Author: Jean-Baptiste Onofré <jbono...@apache.org>
AuthorDate: Wed Oct 3 07:10:39 2018 +0200

    Merge pull request #627 from jbonofre/KARAF-5947
    
    [KARAF-5947] Upgrade to Felix ConfigAdmin 1.9.6

 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)