Merge remote-tracking branch 'origin/3.1.x'

Author: OlgaMaciaszek

docs/src/main/asciidoc/_configprops.adoc

@@ -16,6 +16,7 @@
 |spring.cloud.discovery.client.simple.local.instance-id |  | 
 |spring.cloud.discovery.client.simple.local.metadata |  | 
 |spring.cloud.discovery.client.simple.local.port | `+++0+++` | 
+|spring.cloud.discovery.client.simple.local.secure | `+++false+++` | 
 |spring.cloud.discovery.client.simple.local.service-id |  | 
 |spring.cloud.discovery.client.simple.local.uri |  | 
 |spring.cloud.discovery.client.simple.order |  | 
@@ -56,7 +57,7 @@
 |spring.cloud.loadbalancer.retry.backoff.min-backoff | `+++5 ms+++` | Used to set `RetryBackoffSpec#minBackoff`.
 |spring.cloud.loadbalancer.retry.enabled | `+++true+++` | Enables LoadBalancer retries.
 |spring.cloud.loadbalancer.retry.max-retries-on-next-service-instance | `+++1+++` | Number of retries to be executed on the next `ServiceInstance`. A `ServiceInstance` is chosen before each retry call.
-|spring.cloud.loadbalancer.retry.max-retries-on-same-service-instance | `+++0+++` | umber of retries to be executed on the same `ServiceInstance`.
+|spring.cloud.loadbalancer.retry.max-retries-on-same-service-instance | `+++0+++` | Number of retries to be executed on the same `ServiceInstance`.
 |spring.cloud.loadbalancer.retry.retry-on-all-exceptions | `+++false+++` | Indicates retries should be attempted for all exceptions, not only those specified in `retryableExceptions`.
 |spring.cloud.loadbalancer.retry.retry-on-all-operations | `+++false+++` | Indicates retries should be attempted on operations other than `HttpMethod.GET`}.
 |spring.cloud.loadbalancer.retry.retryable-exceptions | `+++{}+++` | A `Set` of `Throwable` classes that should trigger a retry.

spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java

@@ -143,7 +143,7 @@ public void setHost(String host) {
 	public void setPort(int port) {
 		this.port = port;
 	}
-	
+
 	public void setSecure(boolean secure) {
 		this.secure = secure;
 	}

spring-cloud-commons/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -126,7 +126,7 @@
 		{
 			"name": "spring.cloud.loadbalancer.retry.max-retries-on-same-service-instance",
 			"defaultValue": 0,
-			"description": "umber of retries to be executed on the same `ServiceInstance`.",
+			"description": "Number of retries to be executed on the same `ServiceInstance`.",
 			"type": "java.lang.Integer"
 		},
 		{