tschiman 8f1ca08b46 Merge remote-tracking branch 'upstream/master' ...

# Conflicts:
#	spring-cloud/spring-cloud-bootstrap/svc-book/pom.xml
#	spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java
#	spring-cloud/spring-cloud-bootstrap/svc-rating/pom.xml
#	spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java

2017-04-11 22:39:32 -06:00

..

src

Merge remote-tracking branch 'upstream/master'

2017-04-11 22:39:32 -06:00

pom.xml

BAEL-574 integrating zipkin into the cloud project

2017-02-12 15:55:20 -07:00