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:38 UTC

[directory-fortress-core] 01/03: Merge remote-tracking branch 'origin/jmeter-plugin-upgrade'

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 71a3ad5bdc8c15f72244e041f775e575f726af20
Merge: 8e76ba6 a9de390
Author: Shawn McKinney <sm...@symas.com>
AuthorDate: Mon Jan 17 10:50:43 2022 -0600

    Merge remote-tracking branch 'origin/jmeter-plugin-upgrade'
    
    # Conflicts:
    #	pom.xml

 README-LOAD-TESTING.md |  20 ++++-----
 pom.xml                | 119 ++++++++++++++++++++++++-------------------------
 2 files changed, 68 insertions(+), 71 deletions(-)