[jmeter] branch master updated: Correct typo

2021-08-29 Thread fschumacher
This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 4757204  Correct typo
4757204 is described below

commit 475720408778cdaeec8f072ccf7d50a46f26a773
Author: Felix Schumacher 
AuthorDate: Sun Aug 29 19:25:33 2021 +0200

Correct typo
---
 xdocs/changes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index f035e5a..d9aca2d 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -241,7 +241,7 @@ Summary
   Silence warnings of missing font Arial on startup under linux
   65300IllegalAccessError when opening file dialog with Java 
16
   65336Blank labels when different elements had the same 
name
-  65522Restart doesn't work, when parameters cotain spaces
+  65522Restart doesn't work, when parameters contain spaces
 
 
  


[jmeter] branch master updated: Correct typo in email credits

2021-08-24 Thread fschumacher
This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 a0292c8  Correct typo in email credits
a0292c8 is described below

commit a0292c87dac41f42e04b6d25e537571407f2221b
Author: Felix Schumacher 
AuthorDate: Tue Aug 24 09:35:46 2021 +0200

Correct typo in email credits
---
 xdocs/changes.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 89bd60a..08f7e38 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -133,9 +133,9 @@ Summary
 Non-functional changes
 
   65128643Add missing documentation about Same 
user on each iteration for Thread Groups. Contributed by njkuzas.
-  648Updated xmlgraphics-commons to 2.6 (from 2.3). Contributed 
by Stefan Seide (stefan @ trilobyte.se.de)
-  655667Updated x-stream to 1.4.17 (from 1.4.15). 
Contributed by Stefan Seide (stefan @ trilobyte.se.de)
-  656668Updated json-smart to 2.4.7 (from 2.3), 
accessors-smart to 2.4.7 (from 1.2) and asm 9.1 (from 9.0). Contributed by 
Stefan Seide (stefan @ trilobyte.se.de)
+  648Updated xmlgraphics-commons to 2.6 (from 2.3). Contributed 
by Stefan Seide (stefan at trilobyte-se.de)
+  655667Updated x-stream to 1.4.17 (from 1.4.15). 
Contributed by Stefan Seide (stefan at trilobyte-se.de)
+  656668Updated json-smart to 2.4.7 (from 2.3), 
accessors-smart to 2.4.7 (from 1.2) and asm 9.1 (from 9.0). Contributed by 
Stefan Seide (stefan at trilobyte-se.de)
   64831Log truststore entries in debug level for logger 
org.apache.jmeter.util.keystore.JmeterKeyStore
   65232Hide splash screen when an error is displayed because 
the test plan could not be parsed.
   Updated Groovy to 3.0.8 (from 3.0.7).


[jmeter] branch master updated: Correct typo

2020-09-01 Thread fschumacher
This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 0c6a72d  Correct typo
0c6a72d is described below

commit 0c6a72d3472fffb2c9eccb000cd53e56e25157f8
Author: Felix Schumacher 
AuthorDate: Tue Sep 1 18:08:02 2020 +0200

Correct typo
---
 .../org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java
 
b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java
index 45b2fac..8964fdb 100644
--- 
a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java
+++ 
b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/control/TestCacheManagerBase.java
@@ -264,7 +264,7 @@ public abstract class TestCacheManagerBase extends 
JMeterTestCase {
 sleepTill(start + 1050);
 CacheEntry cachedEntry = getThreadCacheEntry(LOCAL_HOST);
 assertNotNull(cachedEntry, "Should still find entry");
-assertFalse(this.cacheManager.inCache(url), "Should not now find valid 
entry. Found: " + cachedEntry + " at " + System.currentTimeMillis()));
+assertFalse(this.cacheManager.inCache(url), "Should not now find valid 
entry. Found: " + cachedEntry + " at " + System.currentTimeMillis());
 }
 
 @Test



[jmeter] branch master updated: Correct typo: ley -> key

2020-08-09 Thread fschumacher
This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 a1bc13f  Correct typo: ley -> key
a1bc13f is described below

commit a1bc13f1d626fc9d58bb9d5124a72bd07237374d
Author: Felix Schumacher 
AuthorDate: Sun Aug 9 19:48:16 2020 +0200

Correct typo: ley -> key
---
 checksum.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/checksum.xml b/checksum.xml
index 1d62d5a..b8c6ea2 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -133,7 +133,7 @@
 
 
 
-
+
 
 
 



[jmeter] branch master updated: Correct typo in comment in travis file

2020-02-16 Thread fschumacher
This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 f59f36b  Correct typo in comment in travis file
f59f36b is described below

commit f59f36b6682768adc6a170c58cf501a45a56feeb
Author: Felix Schumacher 
AuthorDate: Sun Feb 16 22:05:36 2020 +0100

Correct typo in comment in travis file
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e1b0821..b1f00c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,7 +45,7 @@ matrix:
 - LC_ALL=fr_FR.UTF-8
   script:
 # This job verifies headless mode to ensure Apache JMeter is workable 
in headless as well
-# Spotless and Checksyle are skipped here to save some time. They are 
verified anyway in Java 8 and Java 13 builds, so skipping them for Java 11 does 
not harm
+# Spotless and Checkstyle are skipped here to save some time. They are 
verified anyway in Java 8 and Java 13 builds, so skipping them for Java 11 does 
not harm
 - ./gradlew build -Djava.awt.headless=true -Duser.language=fr 
-Duser.country=FR -PskipCheckstyle -PskipSpotless $SKIP_TAR
 - name: Tests with OpenJDK 11 on s390x 
   os: linux  
@@ -74,7 +74,7 @@ matrix:
 - LANG=fr_FR.UTF-8
 - LC_ALL=fr_FR.UTF-8
   script:
-# Spotless, Checksyle, and JaCoCo are verified here to ensure they all 
work with the latest supported Java
+# Spotless, Checkstyle, and JaCoCo are verified here to ensure they 
all work with the latest supported Java
 - xvfb-run ./gradlew build jacocoReport -Duser.language=fr 
-Duser.country=FR $SKIP_TAR
 - name: jmeter-maven-plugin tests
   jdk: openjdk8



[jmeter] branch master updated: Correct typo

2020-02-11 Thread fschumacher
This is an automated email from the ASF dual-hosted git repository.

fschumacher 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 b3b6dc8  Correct typo
b3b6dc8 is described below

commit b3b6dc86e1d1cdd5b5f8c0f3748d472093abae6b
Author: Felix Schumacher 
AuthorDate: Tue Feb 11 22:46:08 2020 +0100

Correct typo

Make usage of keystore the same lower case as in jmeter.properties
---
 bin/user.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/user.properties b/bin/user.properties
index 2f5d006..c065393 100644
--- a/bin/user.properties
+++ b/bin/user.properties
@@ -124,7 +124,7 @@
 #
 #server.rmi.ssl.keystore.file=rmi_keystore.jks
 #
-# Password of Keystore
+# Password of keystore
 #
 #server.rmi.ssl.keystore.password=changeit
 #