Skip to content

Conversation

OlgaMaciaszek
Copy link
Contributor

IMPORTANT: Only merge after spring-cloud/spring-cloud-commons#691 and spring-cloud/spring-cloud-openfeign#300 have been merged.

marcingrzejszczak and others added 12 commits January 23, 2020 10:02
# Conflicts:
#	pom.xml
#	spring-cloud-zookeeper-discovery/pom.xml
#	spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java
#	spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/StickyRule.java
#	spring-cloud-zookeeper-discovery/src/main/resources/META-INF/spring.factories
…nfiguration and DependencyLoadBalancerAutoConfiguration.
Add ZookeeperServiceInstanceListSupplier.
Add LoadBalancerZookeeperAutoConfiguration.
…toConfiguration. Change return type for BlockingDependencyLoadBalancerConfiguration.
…rFunction implementations following a team discussion. Remove Ribbon-specific entries from docs. Add javadocs.
@OlgaMaciaszek OlgaMaciaszek merged commit 59c0010 into master Feb 22, 2020
@spencergibb spencergibb deleted the boot_2_3 branch January 4, 2022 21:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants