SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes dual discovery client beans by only relying on auto-configuration

Browse Source
This commit is contained in:
Spencer Gibb
2018-04-25 16:43:23 -04:00
committed by Ioannis Canellos
parent 1f8009e8bc
commit b95bc427af
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-kubernetes-discovery/src/main/resources/META-INF/spring.factories
View File

@@ -1,3 +1,8 @@
<<<<<<< HEAD
# Discovery Client Configuration
org.springframework.cloud.client.discovery.EnableDiscoveryClient=\
org.springframework.cloud.kubernetes.discovery.KubernetesDiscoveryClientConfiguration
=======
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.springframework.cloud.kubernetes.discovery.KubernetesDiscoveryClientAutoConfiguration
>>>>>>> a8d32ef... Fixes dual discovery client beans by only relying on auto-configuration