[jmeter] branch master updated: Space police, mainly to trigger a CI run

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 9e4ead5  Space police, mainly to trigger a CI run
9e4ead5 is described below

commit 9e4ead5ec40178e3955d626629874843fcea86a2
Author: Felix Schumacher 
AuthorDate: Tue Feb 11 23:37:24 2020 +0100

Space police, mainly to trigger a CI run
---
 bin/upgrade.properties | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/upgrade.properties b/bin/upgrade.properties
index 182ba93..0ea494a 100644
--- a/bin/upgrade.properties
+++ b/bin/upgrade.properties
@@ -20,16 +20,16 @@
 #
 # Format is as follows --
 # for renamed test element & GUI classes:
-#  old.class.Name=new.class.Name
-#  old.class.Name|guiClassName=new.class.Name
-#  (e.g. for ConfigTestElement)
+# old.class.Name=new.class.Name
+# old.class.Name|guiClassName=new.class.Name
+# (e.g. for ConfigTestElement)
 #
 # for renamed / deleted properties:
-#  class.Name/Old.propertyName=newPropertyName
-#  if newPropertyName is omitted, then property is deleted
+# class.Name/Old.propertyName=newPropertyName
+# if newPropertyName is omitted, then property is deleted
 #
 # for renamed values:
-#  old.class.Name.old.propertyName/oldValue=newValue
+# old.class.Name.old.propertyName/oldValue=newValue
 #
 
 
org.apache.jmeter.protocol.http.config.gui.UrlConfigGui=org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui



[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
 #



[jmeter] branch master updated: Make spelling more consistent

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 b34d67d  Make spelling more consistent
b34d67d is described below

commit b34d67d9f1e7133e9c9ecaf30a9811fa1cbe02d1
Author: Felix Schumacher 
AuthorDate: Tue Feb 11 22:37:19 2020 +0100

Make spelling more consistent

Correct two typos and use all upper case for abbreviations like XML.
Try to be more consistent on upper/lower case for words like keystore or 
truststore.
Insert space between numbers and corresponding units like MB (use 
consistent units).
---
 bin/jmeter.properties | 42 +-
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/bin/jmeter.properties b/bin/jmeter.properties
index da881c6..0a0d638 100644
--- a/bin/jmeter.properties
+++ b/bin/jmeter.properties
@@ -132,13 +132,13 @@
 # Custom settings for Mac using System LAF if you don't want to use Darcula
 #jmeter.laf.mac=System
 
-# Failing that, the JMeter default laf can be defined:
+# Failing that, the JMeter default LAF can be defined:
 #jmeter.laf=System
 
 # If none of the above jmeter.laf properties are defined, JMeter uses the 
CrossPlatform LAF.
 # This is because the CrossPlatform LAF generally looks better than the System 
LAF.
 # See https://bz.apache.org/bugzilla/show_bug.cgi?id=52026 for details
-# N.B. the laf can be defined in user.properties.
+# N.B. the LAF can be defined in user.properties.
 
 # LoggerPanel display
 # default to false
@@ -158,10 +158,10 @@
 #jmeter.gui.refresh_period=500
 
 # HiDPI mode (default: false)
-# Activate a 'pseudo'-hidpi mode. Allows to increase size of some UI elements
+# Activate a 'pseudo'-HiDPI mode. Allows to increase size of some UI elements
 # which are not correctly managed by JVM with high resolution screens in Linux 
or Windows
 #jmeter.hidpi.mode=false
-# To enable pseudo-hidpi mode change to true
+# To enable pseudo-HiDPI mode change to true
 #jmeter.hidpi.mode=true
 # HiDPI scale factor
 #jmeter.hidpi.scale.factor=1.0
@@ -229,7 +229,7 @@ gui.quick_9=ViewResultsFullVisualizer
 #Enable auto backups of the .jmx file when a test plan is saved.
 #When enabled, before the .jmx is saved, it will be backed up to the directory 
pointed
 #by the jmeter.gui.action.save.backup_directory property (see below). Backup 
file names are built
-#after the jmx file being saved. For example, saving test-plan.jmx will create 
a test-plan-12.jmx
+#after the .jmx file being saved. For example, saving test-plan.jmx will 
create a test-plan-12.jmx
 #in the backup directory provided that the last created backup file is 
test-plan-11.jmx.
 #Default value is true indicating that auto backups are enabled
 #jmeter.gui.action.save.backup_on_save=true
@@ -301,7 +301,7 @@ remote_hosts=127.0.0.1
 # the following property before starting the server:
 #server.rmi.localport=4000
 
-# The jmeter server creates by default the RMI registry as part of the server 
process.
+# The JMeter server creates by default the RMI registry as part of the server 
process.
 # To stop the server creating the RMI registry:
 #server.rmi.create=false
 
@@ -317,7 +317,7 @@ remote_hosts=127.0.0.1
 # Keystore file that contains private key
 #server.rmi.ssl.keystore.file=rmi_keystore.jks
 #
-# Password of Keystore
+# Password of keystore
 #server.rmi.ssl.keystore.password=changeit
 #
 # Key alias
@@ -329,7 +329,7 @@ remote_hosts=127.0.0.1
 # Keystore file that contains certificate
 #server.rmi.ssl.truststore.file=rmi_keystore.jks
 #
-# Password of Trust store
+# Password of truststore
 #server.rmi.ssl.truststore.password=changeit
 #
 # Set this if you don't want to use SSL for RMI
@@ -390,7 +390,7 @@ remote_hosts=127.0.0.1
 # Name of application module used in jaas.conf
 #kerberos_jaas_application=JMeter
 
-# Should ports be stripped from urls before constructing SPNs
+# Should ports be stripped from URLs before constructing SPNs
 # for SPNEGO authentication
 #kerberos.spnego.strip_port=true
 
@@ -551,7 +551,7 @@ remote_hosts=127.0.0.1
 # By default JMeter sends the variable to all servers
 # to ensure that the correct data is available at the client.
 
-# Optional xml processing instruction for line 2 of the file:
+# Optional XML processing instruction for line 2 of the file:
 # Example:
 #jmeter.save.saveservice.xml_pi=
 # Default value:
@@ -620,7 +620,7 @@ upgrade_properties=/bin/upgrade.properties
 # HttpClient4.x
 #jmeter.httpsampler=HttpClient4
 
-# By default JMeter tries to be more lenient with RFC2616 redirects and allows
+# By default JMeter tries to be more lenient with RFC 2616 redirects and allows
 # relative paths.
 # If you want to test strict conformance, set this value to true
 # When the property is true, JMeter follows 
http://tools.ietf.org/html/rfc3986#section-5.2
@@ -696,7 +696,7 @@