SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
Files
31056639464f3bd5509e77605e095cd8e578d911
spring-cloud-commons/docs
History
Olga Maciaszek-Sharma 3105663946 Merge remote-tracking branch 'upstream/master' into gh-304-add-discovery-clients-order-support. 
Add changes after code review.

Modify

# Conflicts:
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClient.java
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryProperties.java
2018-09-07 10:08:02 +02:00
..
src/main/asciidoc
Merge remote-tracking branch 'upstream/master' into gh-304-add-discovery-clients-order-support.
2018-09-07 10:08:02 +02:00
pom.xml
Upgrades to build 2.1.0.BUILD-SNAPSHOT and boot 2.1.x
2018-08-02 11:19:17 -04:00