Merge branch 'master' into 2.0.x

2017-08-25 12:04:41 +02:00
parent 76d7dfb5b3 b83caf4ac0
commit db5e16f998
36 changed files with 92 additions and 94 deletions
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/src/main/java/sample/SampleRibbonApplication.java
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/src/main/java/sample/SampleRibbonApplication.java
@@ -37,7 +37,7 @@ import zipkin.Span;
@EnableZuulProxy
 public class SampleRibbonApplication {

-	private static Log logger = LogFactory.getLog(SampleRibbonApplication.class);
+	private static final Log logger = LogFactory.getLog(SampleRibbonApplication.class);

 	public static void main(String[] args) {
 		SpringApplication.run(SampleRibbonApplication.class, args);