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

# Conflicts:
#	docs/src/main/asciidoc/spring-cloud-openfeign.adoc
This commit is contained in:
Olga Maciaszek-Sharma
2020-03-27 13:04:51 +01:00

View File

@@ -63,7 +63,7 @@ The load-balancer client above will want to discover the physical addresses
for the "stores" service. If your application is a Eureka client then
it will resolve the service in the Eureka service registry. If you
don't want to use Eureka, you can simply configure a list of servers
in your external configuration.
in your external configuration using https://cloud.spring.io/spring-cloud-static/spring-cloud-commons/current/reference/html/#simplediscoveryclient[`SimpleDiscoveryClient`].
[[spring-cloud-feign-overriding-defaults]]
=== Overriding Feign Defaults