Olga Maciaszek-Sharma 3ed6ef475c Merge remote-tracking branch 'origin/2.2.x' ...

# Conflicts:
#	spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceLoadBalancerFeignClient.java
#	tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue1125/ManuallyCreatedLoadBalancerFeignClientTests.java
#	tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue1125delegates/ManuallyCreatedDelegateLoadBalancerFeignClientTests.java

2020-04-08 11:12:54 +02:00

..

src

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

2020-04-08 11:12:54 +02:00

pom.xml

Merge branch '2.2.x'

2020-04-03 16:17:24 +08:00