add ability to disable config via properties

spring-cloud · Jun 18, 2015 · 90dfce5 · 90dfce5
1 parent a66e7c2
commit 90dfce5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/...main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java b/...main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java
@@ -31,7 +31,7 @@
 @Configuration
 @Import(ConsulAutoConfiguration.class)
 @EnableConfigurationProperties
-@ConditionalOnProperty(name = "spring.cloud.consul.enabled", matchIfMissing = true)
+@ConditionalOnProperty(name = "spring.cloud.consul.config.enabled", matchIfMissing = true)
 public class ConsulConfigBootstrapConfiguration {
 
 	@Autowired

diff --git a/spring-cloud-consul-sample/src/main/resources/application.yml b/spring-cloud-consul-sample/src/main/resources/application.yml
@@ -1,11 +1,6 @@
 server:
   port: 8080
 
-#TODO: figure out why I need this here and in bootstrap.yml
-#spring:
-#  application:
-#    name: testConsulApp
-
 ribbon:
   ServerListRefreshInterval: 1000