From commits-return-51934-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Mon Jul 6 07:52:23 2020 Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by minotaur.apache.org (Postfix) with SMTP id DCF2819D30 for ; Mon, 6 Jul 2020 07:52:22 +0000 (UTC) Received: (qmail 58285 invoked by uid 500); 6 Jul 2020 07:52:22 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 58113 invoked by uid 500); 6 Jul 2020 07:52:22 -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 58021 invoked by uid 99); 6 Jul 2020 07:52:21 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Jul 2020 07:52:21 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 6CDD7890BB; Mon, 6 Jul 2020 07:52:21 +0000 (UTC) Date: Mon, 06 Jul 2020 07:52:24 +0000 To: "commits@directory.apache.org" Subject: [directory-fortress-core] 03/03: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-fortress-core MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: elecharny@apache.org In-Reply-To: <159402194122.15718.15024152338636697189@gitbox.apache.org> References: <159402194122.15718.15024152338636697189@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: directory-fortress-core X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: dc9c1a98966ebedb4b987c37d7b80a18b2775a99 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20200706075221.6CDD7890BB@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. elecharny pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/directory-fortress-core.git commit dc9c1a98966ebedb4b987c37d7b80a18b2775a99 Merge: 3414d3a 834a5f4 Author: emmanuel lecharny AuthorDate: Mon Jul 6 09:51:58 2020 +0200 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-fortress-core # Conflicts: # src/docker/apacheds-for-apache-fortress-tests/Dockerfile # src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java .gitignore | 2 +- README-CONFIG.md | 44 ++-- README-QUICKSTART-APACHEDS.md | 4 - README-QUICKSTART-DOCKER-APACHEDS.md | 226 ++++++++++--------- README-QUICKSTART-DOCKER-SLAPD.md | 245 +++++++++++---------- README-QUICKSTART-SLAPD.md | 4 - build-config.xml | 8 +- pom.xml | 26 +-- slapd.properties.example | 4 +- .../apacheds-for-apache-fortress-tests/Dockerfile | 2 +- .../apacheds-for-apache-fortress-tests/README.md | 8 + .../openldap-for-apache-fortress-tests/slapd.conf | 149 +++++++++++++ .../directory/fortress/core/impl/ConfigDAO.java | 6 +- .../directory/fortress/core/util/Config.java | 16 +- 14 files changed, 456 insertions(+), 288 deletions(-)