Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 579BB200BBE for ; Thu, 6 Oct 2016 19:49:24 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 56526160AEE; Thu, 6 Oct 2016 17:49:24 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E980D160AF2 for ; Thu, 6 Oct 2016 19:49:22 +0200 (CEST) Received: (qmail 48877 invoked by uid 500); 6 Oct 2016 17:49:20 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 47433 invoked by uid 99); 6 Oct 2016 17:49:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Oct 2016 17:49:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 667E8E5CE1; Thu, 6 Oct 2016 17:49:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cpike@apache.org To: commits@directory.apache.org Date: Thu, 06 Oct 2016 17:49:58 -0000 Message-Id: In-Reply-To: <0f8d33fb296a46aeb8e4ce632af5ed28@git.apache.org> References: <0f8d33fb296a46aeb8e4ce632af5ed28@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [41/43] directory-fortress-core git commit: Merge branch 'master' into feature/addPermAttrAndUserRoleConstraints archived-at: Thu, 06 Oct 2016 17:49:24 -0000 Merge branch 'master' into feature/addPermAttrAndUserRoleConstraints 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/6fa1c9df Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/6fa1c9df Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/6fa1c9df Branch: refs/heads/master Commit: 6fa1c9dfb4e0dd986beeec41028ee966381299a8 Parents: 0a6a44d 9271edf Author: clp207 Authored: Fri Sep 23 07:29:57 2016 -0400 Committer: clp207 Committed: Fri Sep 23 07:29:57 2016 -0400 ---------------------------------------------------------------------- README-QUICKSTART-APACHEDS.md | 13 +- README-QUICKSTART-SLAPD.md | 13 +- ldap/schema/apacheds-fortress.ldif | 168 +++++++++---------- ldap/schema/fortress.schema | 12 +- .../fortress/core/impl/AdminMgrImpl.java | 4 +- .../fortress/core/impl/AdminRoleP.java | 4 +- .../fortress/core/impl/Manageable.java | 10 +- 7 files changed, 120 insertions(+), 104 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/6fa1c9df/ldap/schema/fortress.schema ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/6fa1c9df/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java ----------------------------------------------------------------------