Code

sync from locustio#2

Code

Merged

taojy123 merged 8 commits intotaojy123:mastertaojy123/locust:masterfrom locustio:masterlocustio/locust:masterCopy head branch name to clipboardAug 25, 2020

+114-8

Commits

Commits on Aug 21, 2020

• Merge pull request #1538 from taojy123/master

  Show description for 7d42d9b
  cyberw

  authored
  7d42d9b

  Copy full SHA for 7d42d9b

• clarify logging message ("immediately" might sound like it disregards stop timeout, which it doesnt). 99% of users wont be using ramp down so making it just a little bit clearer for them is not wor…

  Show description for 709f189
  cyberw

  committed
  709f189

  Copy full SHA for 709f189

• Fix shape worker in headless.

  cyberw

  committed
  36d874f

  Copy full SHA for 36d874f

• Fix test for non-shape runs and add a dedicated one for shaped runs

  cyberw

  committed
  7b5589a

  Copy full SHA for 7b5589a

• Merge pull request #1539 from locustio/fix-shape-functionality-for-headless

  Show description for 2abfdda
  cyberw

  authored
  2abfdda

  Copy full SHA for 2abfdda

Commits on Aug 22, 2020

• Release 1.2.2

  cyberw

  committed
  1b9738c

  Copy full SHA for 1b9738c

Commits on Aug 24, 2020

• Fix stopping of LoadTestShape test

  max-rocket-internet

  committed
  bdea544

  Copy full SHA for bdea544

• Merge pull request #1541 from max-rocket-internet/fix_shape_restart

  Show description for b12aa3d
  cyberw

  authored
  b12aa3d

  Copy full SHA for b12aa3d