This is an automated email from the ASF dual-hosted git repository. fschumacher pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push: new 3484eb7 Add option to create a diff 3484eb7 is described below commit 3484eb762814e88ca2a265991b7b5d0516ea204a Author: jmetertea <33323555+jmeter...@users.noreply.github.com> AuthorDate: Mon Jun 15 08:22:33 2020 +0300 Add option to create a diff Closes #598 --- xdocs/building.xml | 1 + xdocs/changes.xml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/xdocs/building.xml b/xdocs/building.xml index 95f139b..e0b94f1 100644 --- a/xdocs/building.xml +++ b/xdocs/building.xml @@ -121,6 +121,7 @@ Check that patch does not break JUnit tests by running: <li>Add JMeter repository as upstream : <source>git remote add upstream http://www.github.com/apache/jmeter</source></li> <li>push it : <source>git push origin BUGID</source></li> <li>Create a PR and link it in the bugzilla issue</li> + <li>Or create a diff and add as attachment to bugzilla issue <source>git diff > BUGID.patch</source></li> </ul> <note>Different operation systems have different defaults for end-of-line markers. diff --git a/xdocs/changes.xml b/xdocs/changes.xml index cb221a6..7df83da 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -121,6 +121,7 @@ Summary <li>Updated Darklaf to 2.2.1 (from 2.1.1)</li> <li><pr>596</pr>Use neutral words in documentation</li> <li><bug>63809</bug><pr>557</pr>Updated commons-collections to 4.4 (from 3.2.2) while keeping the jars for the old commons-collections 3.x for compatibility</li> + <li><pr>598</pr>Add another option for creating diffs to the building page. Contributed by jmetertea (github.com/jmetertea)</li> </ul> <!-- =================== Bug fixes =================== --> @@ -177,6 +178,7 @@ Summary <ul> <li>Michael Weidmann (https://github.com/michaelweidmann)</li> <li>Deng Liming (liming.d.pro at gmail.com>)</li> + <li>jmetertea (https://github.com/jmetertea)</li> </ul> <p>We also thank bug reporters who helped us improve JMeter.</p> <ul>