Olga Maciaszek-Sharma
f5a5bef06f
Merge remote-tracking branch 'origin/2.2.x'
# Conflicts:
# docs/pom.xml
# pom.xml
# spring-cloud-commons-dependencies/pom.xml
# spring-cloud-commons/pom.xml
# spring-cloud-context-integration-tests/pom.xml
# spring-cloud-context-webflux-integration-tests/pom.xml
# spring-cloud-context/pom.xml
# spring-cloud-loadbalancer/pom.xml
# spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java
# spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfigurationTests.java
# spring-cloud-starter-loadbalancer/pom.xml
# spring-cloud-starter/pom.xml
# spring-cloud-test-support/pom.xml