From fce34adc97ab20bb2dcdbab2142a2aed972cc6ee Mon Sep 17 00:00:00 2001 From: "Anh Le (Andy)" Date: Wed, 30 May 2018 06:45:39 +0700 Subject: [PATCH 1/5] Update third-party-tools.rst Added Java Locust Swarm client --- docs/third-party-tools.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/third-party-tools.rst b/docs/third-party-tools.rst index 9a0a4fd58c..8207318b60 100644 --- a/docs/third-party-tools.rst +++ b/docs/third-party-tools.rst @@ -18,4 +18,6 @@ Boomer (Golang) Locust4j (Java) --------------- -`Locust4j `_ is a Locust slave runner written in Java. \ No newline at end of file +`Locust4j `_ is a Locust slave runner written in Java. + +`Swarm `_ is another elegant Java client for Locust From 89f7b192af2f79e4ebf6975471aa848166278c66 Mon Sep 17 00:00:00 2001 From: "Anh Le (Andy)" Date: Wed, 30 May 2018 18:42:09 +0700 Subject: [PATCH 2/5] Update third-party-tools.rst Categorized clients by their programming languages --- docs/third-party-tools.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/third-party-tools.rst b/docs/third-party-tools.rst index 8207318b60..e73d719a17 100644 --- a/docs/third-party-tools.rst +++ b/docs/third-party-tools.rst @@ -10,14 +10,14 @@ supported by many languages. So, you can write your Locust tasks in any language libraries do the job as a slave runner. They run your Locust tasks, and report to master regularly. -Boomer (Golang) +Golang --------------- -`Boomer `_ is a Locust slave runner written in golang. +- `Boomer `_ is a Locust slave runner written in Golang. -Locust4j (Java) +Java --------------- -`Locust4j `_ is a Locust slave runner written in Java. +- `Locust4j `_ is a Locust slave runner written in Java. -`Swarm `_ is another elegant Java client for Locust +- `Swarm `_ is another elegant Java client for Locust. From 9d2b5a02ed28b99fb83e6b45cf734175017b25b5 Mon Sep 17 00:00:00 2001 From: "Anh Le (Andy)" Date: Wed, 30 May 2018 21:22:03 +0700 Subject: [PATCH 3/5] Update third-party-tools.rst --- docs/third-party-tools.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/third-party-tools.rst b/docs/third-party-tools.rst index e73d719a17..20b33fc03a 100644 --- a/docs/third-party-tools.rst +++ b/docs/third-party-tools.rst @@ -10,14 +10,14 @@ supported by many languages. So, you can write your Locust tasks in any language libraries do the job as a slave runner. They run your Locust tasks, and report to master regularly. -Golang +Golang --------------- -- `Boomer `_ is a Locust slave runner written in Golang. +- `Boomer `_ Java --------------- -- `Locust4j `_ is a Locust slave runner written in Java. +- `Locust4j `_ -- `Swarm `_ is another elegant Java client for Locust. +- `Swarm `_ From 7ace2e5e2473a822dae2e27a8f43f5a8be88472e Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Sat, 9 Jun 2018 18:57:59 -0700 Subject: [PATCH 4/5] Update all pypi.python.org URLs to pypi.org (#818) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 224df8d9c9..2b72e48c2f 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@ [![Build Status](https://img.shields.io/travis/locustio/locust.svg)](https://travis-ci.org/locustio/locust) [![codecov](https://codecov.io/gh/locustio/locust/branch/master/graph/badge.svg)](https://codecov.io/gh/locustio/locust) [![license](https://img.shields.io/github/license/locustio/locust.svg)](https://github.com/locustio/locust/blob/master/LICENSE) -[![PyPI](https://img.shields.io/pypi/v/locustio.svg)](https://pypi.python.org/pypi/locustio) -[![PyPI](https://img.shields.io/pypi/pyversions/locustio.svg)](https://pypi.python.org/pypi/locustio) +[![PyPI](https://img.shields.io/pypi/v/locustio.svg)](https://pypi.org/project/locustio/) +[![PyPI](https://img.shields.io/pypi/pyversions/locustio.svg)](https://pypi.org/project/locustio/) [![GitHub contributors](https://img.shields.io/github/contributors/locustio/locust.svg)](https://github.com/locustio/locust/graphs/contributors) ## Links From 61b43c7df442d6829b4c1bf9fba176cad9a2347c Mon Sep 17 00:00:00 2001 From: Felix Yan Date: Fri, 15 Jun 2018 01:11:46 +0800 Subject: [PATCH 5/5] Fix some typos in events.py (#820) --- locust/events.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locust/events.py b/locust/events.py index de049f97b4..82c496fc14 100644 --- a/locust/events.py +++ b/locust/events.py @@ -113,14 +113,14 @@ def fire(self, reverse=False, **kwargs): """ *master_start_hatching* is fired when we initiate the hatching process on the master. -This event is especially usefull to detect when the 'start' button is clicked on the web ui. +This event is especially useful to detect when the 'start' button is clicked on the web ui. """ master_stop_hatching = EventHook() """ *master_stop_hatching* is fired when terminate the hatching process on the master. -This event is especially usefull to detect when the 'stop' button is clicked on the web ui. +This event is especially useful to detect when the 'stop' button is clicked on the web ui. """ locust_start_hatching = EventHook()