slavisa-baeldung 3b91bb63d1 Merge branch 'master' into sla-pr/1159-tim-doha ...

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-03-02 05:43:19 +01:00

..

src

Merge branch 'master' into sla-pr/1159-tim-doha

2017-03-02 05:43:19 +01:00

pom.xml

BAEL-574 integrating zipkin into the cloud project

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