jmeter-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Antonio Gomes Rodrigues <ra0...@gmail.com>
Subject Re: [jmeter] branch master updated: Add default values in user.properties file Useful to have the default value and unit without looking at the documentation
Date Wed, 06 May 2020 11:21:59 GMT
Hi Felix

Thanks to your advices

I will do it for my next commit

For this commit I have worked on master because it was a small change, but
I have try do it with IntelliJ, which I haven't mastered yet. Sorry for it

Regards,
Antonio



Le mer. 6 mai 2020 à 13:13, Felix Schumacher <
felix.schumacher@internetallee.de> a écrit :

> Hi Antonio,
>
> nice to see, that you got the git setup completed.
>
> However, we try to keep the commit history linear (if we can :)
>
> You have committed a merge commit, which you probably got when merging
> the newer commits from the master by doing a simple
>
>  git pull / git merge
>
> I find it nicer to do one of the following recipes:
>
>  * working on a local branch
>
>    in this scenario, I create  new branch (often very late in the
> process) by "git checkout -b branch-name" and commit everything I do on
> that branch.
>    When I am ready to commit to central repo, I rebase my commits on (a
> current) master. For example by
>
>     git checkout master
>     git pull
>     git checkout branch-name
>     git rebase master
>     # check that everything still works
>     git checkout master
>     git merge --ff branch-name # use fast forward or die
>
>     now I am ready to push
>
>  * working on master
>
>   in this scenario, I am sure, that a branch is overkill and that the
> small change is ready in no time. Of course, I get distracted and
> someone else is faster
>   committing their change to central master.
>
>   Here I try a pull with integrated rebase first.
>
>   git pull -r
>
>   Most of the time this works as intended and I don't get a merge
> commit, that destroys the linear history.
>
> Regards
>
>  Felix
>
> Am 06.05.20 um 09:20 schrieb agomes@apache.org:
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > agomes 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 642893b  Add default values in user.properties file Useful to
> have the default value and unit without looking at the documentation
> >      new 64718d4  Merge remote-tracking branch 'origin/master'
> > 642893b is described below
> >
> > commit 642893b00e9ec0f41ccdae7833922ac2bd20f799
> > Author: Antonio <ra0077@gmail.com>
> > AuthorDate: Sun May 3 23:56:48 2020 +0200
> >
> >     Add default values in user.properties file
> >     Useful to have the default value and unit without looking at the
> documentation
> > ---
> >  bin/user.properties | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/bin/user.properties b/bin/user.properties
> > index c065393..8ba89f1 100644
> > --- a/bin/user.properties
> > +++ b/bin/user.properties
> > @@ -72,6 +72,7 @@
> >  #jmeter.reportgenerator.end_date=
> >
> >  # Change this parameter if you want to change the granularity of over
> time graphs.
> > +# Set to 60000 ms by default
> >  #jmeter.reportgenerator.overall_granularity=60000
> >
> >  # Change this parameter if you want to change the granularity of
> Response time distribution
> > @@ -84,9 +85,11 @@
> >  #jmeter.reportgenerator.sample_filter=
> >
> >  # Change this parameter if you want to override the APDEX satisfaction
> threshold.
> > +# Set to 500 ms by default
> >  #jmeter.reportgenerator.apdex_satisfied_threshold=500
> >
> >  # Change this parameter if you want to override the APDEX tolerance
> threshold.
> > +# Set to 1500 ms by default
> >  #jmeter.reportgenerator.apdex_tolerated_threshold=1500
> >
> >  # Indicates which graph series are filtered (regular expression)
> >
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message