Merge branch '2.1.x'

# Conflicts: # docs/pom.xml # pom.xml # spring-cloud-cloudfoundry-commons/pom.xml # spring-cloud-cloudfoundry-dependencies/pom.xml # spring-cloud-cloudfoundry-discovery/pom.xml # spring-cloud-cloudfoundry-sample/pom.xml # spring-cloud-cloudfoundry-web/pom.xml # spring-cloud-starter-cloudfoundry/pom.xml
2019-09-18 12:24:13 +02:00
parent 44f0be495d ddf29d4d69
commit 2127b20286
1 changed files with 0 additions and 1 deletions
--- a/spring-cloud-starter-cloudfoundry/src/main/resources/META-INF/spring.provides
+++ b/spring-cloud-starter-cloudfoundry/src/main/resources/META-INF/spring.provides
@@ -1 +0,0 @@
-provides: spring-cloud-security