Merge branch '2.1.x'

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

View File

@@ -1 +0,0 @@
provides: spring-cloud-zookeeper-config, spring-cloud-zookeeper-discovery

View File

@@ -1 +0,0 @@
provides: spring-cloud-zookeeper-config, curator-recipes

View File

@@ -1 +0,0 @@
provides: spring-cloud-zookeeper-discovery, curator-x-discovery

View File

@@ -1 +0,0 @@
provides: spring-cloud-zookeeper-core, curator-framework