Merge branch '2.1.x'

# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-consul-binder/pom.xml
#	spring-cloud-consul-config/pom.xml
#	spring-cloud-consul-core/pom.xml
#	spring-cloud-consul-dependencies/pom.xml
#	spring-cloud-consul-discovery/pom.xml
#	spring-cloud-consul-sample/pom.xml
#	spring-cloud-starter-consul-all/pom.xml
#	spring-cloud-starter-consul-bus/pom.xml
#	spring-cloud-starter-consul-config/pom.xml
#	spring-cloud-starter-consul-discovery/pom.xml
#	spring-cloud-starter-consul/pom.xml
This commit is contained in:
Olga Maciaszek-Sharma
2019-09-18 12:50:52 +02:00
5 changed files with 0 additions and 5 deletions

View File

@@ -1 +0,0 @@
provides: spring-cloud-consul-bus, spring-cloud-consul-config, spring-cloud-consul-discovery, spring-cloud-consul-ui

View File

@@ -1 +0,0 @@
provides: spring-cloud-consul-bus

View File

@@ -1 +0,0 @@
provides: spring-cloud-consul-config

View File

@@ -1 +0,0 @@
provides: spring-cloud-consul-discovery

View File

@@ -1 +0,0 @@
provides: spring-cloud-consul-core, consul-api