From 90dfce599035cfacb63469d0088c52a333b47d96 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 18 Jun 2015 14:38:51 -0600 Subject: [PATCH] add ability to disable config via properties --- .../consul/config/ConsulConfigBootstrapConfiguration.java | 2 +- .../src/main/resources/application.yml | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java index d4d6cd71..cd0da6a1 100644 --- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java +++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigBootstrapConfiguration.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Import; @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 index c8d3ccb3..366a8af7 100644 --- 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