From b95bc427af09d43d1c0536c88099edbcfdf83d43 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Wed, 25 Apr 2018 16:43:23 -0400 Subject: [PATCH] Fixes dual discovery client beans by only relying on auto-configuration --- .../src/main/resources/META-INF/spring.factories | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spring-cloud-kubernetes-discovery/src/main/resources/META-INF/spring.factories b/spring-cloud-kubernetes-discovery/src/main/resources/META-INF/spring.factories index a542fcb2..9dc2700e 100644 --- a/spring-cloud-kubernetes-discovery/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-kubernetes-discovery/src/main/resources/META-INF/spring.factories @@ -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