SpringCloud/spring-cloud-cloudfoundry
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source 
# Conflicts:
#	pom.xml
#	spring-cloud-cloudfoundry-dependencies/pom.xml
This commit is contained in:
Olga Maciaszek-Sharma
2019-05-10 16:08:52 +02:00
parent b49c94b2f2 328b0df842
commit e41b177129
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-cloudfoundry-discovery/pom.xml
View File

@@ -33,7 +33,7 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-core</artifactId>
<artifactId>spring-cloud-netflix-hystrix</artifactId>
<optional>true</optional>
</dependency>
<dependency>