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 2022/01/17 16:57:39 UTC

[directory-fortress-core] 02/03: Merge remote-tracking branch 'origin/master'

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 90ca4d4dc7720a01f4334746f57a4d69c44e5a64
Merge: 71a3ad5 e9e3e06
Author: Shawn McKinney <sm...@symas.com>
AuthorDate: Mon Jan 17 10:51:01 2022 -0600

    Merge remote-tracking branch 'origin/master'
    
    # Conflicts:
    #	pom.xml

 README-LOAD-TESTING.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)