Merged 1.2.x to master

2017-10-19 13:49:29 +02:00
parent 1aa30eda5e
commit 5bdc64ab6c
3 changed files with 9 additions and 4 deletions
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/trace/DefaultTracerTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/trace/DefaultTracerTests.java
@@ -232,6 +232,7 @@ public class DefaultTracerTests {
 		tracer.close(span);
 	}

+
  /**
   * To support conversion to Amazon trace IDs, the first 32 bits of the trace ID are epoch seconds.
   */