You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@directory.apache.org by sm...@apache.org on 2020/07/28 13:21:14 UTC

[directory-fortress-core] 03/03: Merge branch 'pr/13'

This is an automated email from the ASF dual-hosted git repository.

smckinney pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-fortress-core.git

commit c9cb1f0885495dc5d22c1af9ce71bfe145996663
Merge: 1147b22 e5d784d
Author: Shawn McKinney <sm...@symas.com>
AuthorDate: Tue Jul 28 08:20:43 2020 -0500

    Merge branch 'pr/13'

 config/bootstrap/log4j.xml    | 40 -------------------------
 config/bootstrap/log4j2.xml   | 50 +++++++++++++++++++++++++++++++
 config/log4j.xml              | 57 -----------------------------------
 config/log4j2.xml             | 70 +++++++++++++++++++++++++++++++++++++++++++
 pom.xml                       | 70 +++++++++++++++++++++++++++++++------------
 src/test/resources/log4j.xml  | 57 -----------------------------------
 src/test/resources/log4j2.xml | 69 ++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 240 insertions(+), 173 deletions(-)