karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject [2/2] git commit: Merge branch 'karaf-2.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-2.x
Date Mon, 14 Jul 2014 10:48:56 GMT
Merge branch 'karaf-2.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-2.x


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c1e1ca0b
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c1e1ca0b
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c1e1ca0b

Branch: refs/heads/karaf-2.x
Commit: c1e1ca0b2f57dc90b4210774c5ba2cd778fd5f6d
Parents: 71aca23 7dd6036
Author: Freeman Fang <freeman.fang@gmail.com>
Authored: Mon Jul 14 18:45:15 2014 +0800
Committer: Freeman Fang <freeman.fang@gmail.com>
Committed: Mon Jul 14 18:45:15 2014 +0800

----------------------------------------------------------------------
 .../enterprise/src/main/resources/features.xml  | 36 ++++++++++++++++++--
 .../features/internal/FeaturesServiceImpl.java  |  2 +-
 .../jaas/modules/ldap/LDAPLoginModule.java      |  4 ++-
 .../main/java/org/apache/karaf/main/Main.java   | 23 ++++++++++---
 .../developers-guide/security-framework.conf    |  6 ++++
 pom.xml                                         |  6 ++--
 6 files changed, 63 insertions(+), 14 deletions(-)
----------------------------------------------------------------------



Mime
View raw message