SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.x'

Browse Source 
# Conflicts:
#	docs/src/main/asciidoc/_configprops.adoc
#	spring-cloud-loadbalancer/src/main/resources/META-INF/additional-spring-configuration-metadata.json
This commit is contained in:
Olga Maciaszek-Sharma
2020-05-04 18:38:03 +02:00
parent aeb30b597d 5f413a7297
commit c33363dde2
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/src/main/asciidoc/_configprops.adoc
View File

@@ -34,6 +34,8 @@
|spring.cloud.loadbalancer.health-check.interval | 30s | Interval for rerunning the HealthCheck scheduler.
|spring.cloud.loadbalancer.health-check.path | |
|spring.cloud.loadbalancer.retry.enabled | true |
|spring.cloud.loadbalancer.ribbon.enabled | true | Causes `RibbonLoadBalancerClient` to be used by default.
|spring.cloud.loadbalancer.zone | | Spring Cloud LoadBalancer zone.
|spring.cloud.refresh.enabled | true | Enables autoconfiguration for the refresh scope and associated features.
|spring.cloud.refresh.extra-refreshable | true | Additional class names for beans to post process into refresh scope.
|spring.cloud.refresh.never-refreshable | true | Comma separated list of class names for beans to never be refreshed or rebound.

15
spring-cloud-loadbalancer/src/main/resources/META-INF/additional-spring-configuration-metadata.json Normal file
View File

@@ -0,0 +1,15 @@
{
"properties": [
{
"defaultValue": true,
"name": "spring.cloud.loadbalancer.ribbon.enabled",
"description": "Causes `RibbonLoadBalancerClient` to be used by default.",
"type": "java.lang.Boolean"
},
{
"name": "spring.cloud.loadbalancer.zone",
"type": "java.lang.String",
"description": "Spring Cloud LoadBalancer zone."
}
]
}