Merge branch 'master' into 2.0.x

2017-10-27 22:33:34 +08:00
parent 986d8d755f bfe15ab0cd
commit 338076d351
17 changed files with 148 additions and 260 deletions
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml
@@ -82,7 +82,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-sleuth-zipkin</artifactId>
+			<artifactId>spring-cloud-sleuth-zipkin2</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>