[jmeter] branch master updated (a4d5d14 -> 60e9b69)

[mi...@apache.org]

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

milamber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.


    from a4d5d14  Add comment about bolt dir in tutorial
     add 6236feb  Prepare next release 5.2
     new 60e9b69  Merge branch 'prepare_v5_2'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gradle.properties         | 5 ++++-
 xdocs/download_jmeter.xml | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

[jmeter] 01/01: Merge branch 'prepare_v5_2'

[mi...@apache.org]

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

milamber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit 60e9b695fcf1c20153711d723ac9d0e4f4ab2120
Merge: a4d5d14 6236feb
Author: Milamber <mi...@apache.org>
AuthorDate: Sat Oct 5 20:32:29 2019 +0100

    Merge branch 'prepare_v5_2'

 gradle.properties         | 5 ++++-
 xdocs/download_jmeter.xml | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

Re: [jmeter] branch master updated (a4d5d14 -> 60e9b69)

[Vladimir Sitnikov <si...@gmail.com>]

>     add 6236feb  Prepare next release 5.2
>     new 60e9b69  Merge branch 'prepare_v5_2'

Milamber, it looks like you've pushed an unintended merge.

This is the exact case that highlights how important force pushes are.

Milamber, could you please clarify your opinion on force pushes? (there was
"Git status update" mail recently)

If you want to have your key id configured, please use your own $HOME
folder and put gradle.properties there.
That way everyone can have their own key id configured, and we don't pick
which key to specify in the git repository.

Vladimir