directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject [directory-fortress-core] 03/03: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-fortress-core
Date Mon, 06 Jul 2020 07:52:24 GMT
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 <emmanuel.lecharny@busit.com>
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(-)



Mime
View raw message