You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2014/10/29 06:10:29 UTC
[8/8] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/directory-fortress-core
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-fortress-core
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/5cd9cbd1
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/5cd9cbd1
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/5cd9cbd1
Branch: refs/heads/master
Commit: 5cd9cbd17e683616b65f948383cb4e2cb5887019
Parents: bc5c551 01427ed
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Wed Oct 29 06:10:02 2014 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Wed Oct 29 06:10:02 2014 +0100
----------------------------------------------------------------------
build.properties | 15 +++---
build.xml | 16 +++---
config/bootstrap/fortress.properties.src | 8 ++-
config/fortress.properties.src | 13 +++++
ldap/setup/refreshLDAPData-src.xml | 4 --
ldap/slapd.conf.src | 1 +
.../core/ldap/ApacheDsDataProvider.java | 56 ++++++++++++++++----
.../directory/fortress/core/rbac/PolicyDAO.java | 5 +-
.../fortress/core/util/attr/AttrHelper.java | 15 +++---
9 files changed, 92 insertions(+), 41 deletions(-)
----------------------------------------------------------------------