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:
@@ -1 +0,0 @@
|
||||
provides: spring-cloud-zookeeper-config, spring-cloud-zookeeper-discovery
|
||||
@@ -1 +0,0 @@
|
||||
provides: spring-cloud-zookeeper-config, curator-recipes
|
||||
@@ -1 +0,0 @@
|
||||
provides: spring-cloud-zookeeper-discovery, curator-x-discovery
|
||||
@@ -1 +0,0 @@
|
||||
provides: spring-cloud-zookeeper-core, curator-framework
|
||||
Reference in New Issue
Block a user