Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/2.2.x'
Browse files Browse the repository at this point in the history
# Conflicts:
#	docs/src/main/asciidoc/_configprops.adoc
  • Loading branch information
OlgaMaciaszek committed Mar 15, 2021
2 parents a375f9f + 9551cfb commit cf21ea8
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions docs/src/main/asciidoc/spring-cloud-commons.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -867,6 +867,8 @@ public class CustomLoadBalancerConfiguration {
}
----

NOTE: The classes you pass as `@LoadBalancerClient` or `@LoadBalancerClients` configuration arguments should either not be annotated with `@Configuration` or be outside component scan scope.

=== Spring Cloud LoadBalancer integrations

In order to make it easy to use Spring Cloud LoadBalancer, we provide `ReactorLoadBalancerExchangeFilterFunction` that can be used with `WebClient` and `BlockingLoadBalancerClient` that works with `RestTemplate`.
Expand Down Expand Up @@ -1198,6 +1200,9 @@ public class MyConfiguration {
}
}
----
NOTE: The classes you pass as `@LoadBalancerClient` or `@LoadBalancerClients` configuration arguments should either not be annotated with `@Configuration` or be outside component scan scope.
====

[[loadbalancer-lifecycle]]
Expand Down

0 comments on commit cf21ea8

Please sign in to comment.