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

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

commit 6a6666859a50f940571004d391b9f50cd2656b19
Merge: 8312da0 ca26f5f
Author: pmouawad <[email protected]>
AuthorDate: Sun Oct 6 11:12:23 2019 +0200

    Merge branch 'master' into remove_mongodb

 build.gradle.kts                                   |  11 ++
 checksum.xml                                       |   1 +
 gradle.properties                                  |   4 +-
 settings.gradle.kts                                |  10 +-
 src/bom/build.gradle.kts                           |   3 +
 .../visualizers/RespTimeGraphVisualizer.java       |   2 +-
 .../jmeter/visualizers/StatGraphVisualizer.java    |   2 +-
 src/core/build.gradle.kts                          |   2 +
 .../jmeter/control/gui/LoopControlPanel.java       |  22 +++-
 .../jmeter/gui/AbstractJMeterGuiComponent.java     |  86 +++++++++----
 .../java/org/apache/jmeter/gui/CommentPanel.java   |   6 +
 .../main/java/org/apache/jmeter/gui/NamePanel.java |   8 ++
 .../apache/jmeter/threads/AbstractThreadGroup.java |   2 +-
 .../jmeter/threads/gui/AbstractThreadGroupGui.java |   4 +-
 .../apache/jmeter/threads/gui/ThreadGroupGui.java  | 143 ++++++---------------
 .../java/org/apache/jmeter/util/JMeterUtils.java   |  15 +++
 .../apache/jmeter/resources/messages.properties    |   6 +-
 .../org/apache/jmeter/threads/ThreadGroupLoad.java | 101 +++++++++++++++
 src/dist/build.gradle.kts                          |   2 +
 src/licenses/build.gradle.kts                      |   8 ++
 src/licenses/licenses/miglayout/LICENSE            |  27 ++++
 .../http/sampler/ParallelResourcesAndIpSource.java | 140 ++++++++++++++++----
 xdocs/changes.xml                                  |   1 -
 xdocs/download_jmeter.xml                          |   2 +-
 xdocs/images/screenshots/setup_thread_group.png    | Bin 21075 -> 29834 bytes
 xdocs/images/screenshots/teardown_thread_group.png | Bin 21499 -> 110310 bytes
 .../screenshots/thread_group_distributed.png       | Bin 29000 -> 39480 bytes
 xdocs/images/screenshots/threadgroup.png           | Bin 22022 -> 31339 bytes
 xdocs/usermanual/component_reference.xml           |  10 +-
 xdocs/usermanual/jmeter_tutorial.xml               |  65 +++++-----
 30 files changed, 473 insertions(+), 210 deletions(-)

diff --cc gradle.properties
index a8df190,ae876f1..a8120f3
--- a/gradle.properties
+++ b/gradle.properties
@@@ -83,7 -84,9 +84,8 @@@ junit4.version=4.1
  junit5.version=5.5.1
  log4j.version=2.12.1
  mail.version=1.5.0-b01
+ miglayout.version=5.2
  mina-core.version=2.0.19
 -mongo-java-driver.version=2.11.3
  neo4j-java-driver.version=1.7.5
  objenesis.version=2.6
  oro.version=2.0.8

Reply via email to