Olga Maciaszek-Sharma
2a1a50848f
Merge remote-tracking branch 'origin/2.2.x'
# Conflicts:
# docs/src/main/asciidoc/spring-cloud-commons.adoc
# spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java
# spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancer.java
# spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/LoadBalancerTests.java
2020-12-04 18:57:33 +01:00
..
2020-12-04 18:57:33 +01:00
2020-12-01 22:32:07 +00:00