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:
@@ -1 +0,0 @@
|
||||
provides: spring-cloud-consul-bus, spring-cloud-consul-config, spring-cloud-consul-discovery, spring-cloud-consul-ui
|
||||
@@ -1 +0,0 @@
|
||||
provides: spring-cloud-consul-bus
|
||||
@@ -1 +0,0 @@
|
||||
provides: spring-cloud-consul-config
|
||||
@@ -1 +0,0 @@
|
||||
provides: spring-cloud-consul-discovery
|
||||
@@ -1 +0,0 @@
|
||||
provides: spring-cloud-consul-core, consul-api
|
||||
Reference in New Issue
Block a user