Merge branch '2.1.x'

# Conflicts: # pom.xml # spring-cloud-consul-dependencies/pom.xml
2019-05-08 16:44:31 +02:00
parent 3ef4c85c80
commit 201f1fcc25
42 changed files with 213 additions and 145 deletions
--- a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConditionalOnConsulEnabled.java
+++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConditionalOnConsulEnabled.java
@@ -49,7 +49,8 @@ public @interface ConditionalOnConsulEnabled {
 		/**
 		 * Consul property is enabled.
 		 */
-		@ConditionalOnProperty(value = "spring.cloud.consul.enabled", matchIfMissing = true)
+		@ConditionalOnProperty(value = "spring.cloud.consul.enabled",
+				matchIfMissing = true)
 		static class FoundProperty {

 		}