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 2014/07/15 17:22:59 UTC
[2/2] git commit: Merge branch 'karaf-3.0.x' of
https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x
Merge branch 'karaf-3.0.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f212afe5
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f212afe5
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f212afe5
Branch: refs/heads/karaf-3.0.x
Commit: f212afe5cf45dfa5e0b93947bbb737436c68884c
Parents: 83438ec fcfc1d4
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Jul 15 17:22:44 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Jul 15 17:22:44 2014 +0200
----------------------------------------------------------------------
.../properties/AutoEncryptionSupport.java | 141 +++++++++++++++++++
.../modules/properties/PropertiesInstaller.java | 72 ----------
.../properties/PropertiesLoginModule.java | 67 +--------
.../OSGI-INF/blueprint/karaf-jaas-module.xml | 16 +++
4 files changed, 158 insertions(+), 138 deletions(-)
----------------------------------------------------------------------