From 5ba7e1fc8300e94a21a2de36c9f62946fa665896 Mon Sep 17 00:00:00 2001
From: buildmaster <buildmaster@springframework.org>
Date: Tue, 27 Aug 2019 07:58:02 +0000
Subject: [PATCH] Sync docs from master to gh-pages

---
 reference/html/index.html               | 1 +
 reference/html/spring-cloud-sleuth.html | 1 +
 2 files changed, 2 insertions(+)

diff --git a/reference/html/index.html b/reference/html/index.html
index d6c1ba2b2..d7565b24d 100644
--- a/reference/html/index.html
+++ b/reference/html/index.html
@@ -2944,6 +2944,7 @@ Callable&lt;String&gt; traceCallableFromTracer = this.tracing.currentTraceContex
 <div class="paragraph">
 <p>We register a custom <a href="https://github.com/Netflix/Hystrix/wiki/Plugins#concurrencystrategy"><code>HystrixConcurrencyStrategy</code></a> called <code>TraceCallable</code> that wraps all <code>Callable</code> instances in their Sleuth representative.
 The strategy either starts or continues a span, depending on whether tracing was already going on before the Hystrix command was called.
+Optionally, you can set <code>spring.sleuth.hystrix.strategy.passthrough</code> to <code>true</code> to just propagate the trace context to the Hystrix execution thread if you don&#8217;t wish to start a new span.
 To disable the custom Hystrix Concurrency Strategy, set the <code>spring.sleuth.hystrix.strategy.enabled</code> to <code>false</code>.</p>
 </div>
 </div>
diff --git a/reference/html/spring-cloud-sleuth.html b/reference/html/spring-cloud-sleuth.html
index d6c1ba2b2..d7565b24d 100644
--- a/reference/html/spring-cloud-sleuth.html
+++ b/reference/html/spring-cloud-sleuth.html
@@ -2944,6 +2944,7 @@ Callable&lt;String&gt; traceCallableFromTracer = this.tracing.currentTraceContex
 <div class="paragraph">
 <p>We register a custom <a href="https://github.com/Netflix/Hystrix/wiki/Plugins#concurrencystrategy"><code>HystrixConcurrencyStrategy</code></a> called <code>TraceCallable</code> that wraps all <code>Callable</code> instances in their Sleuth representative.
 The strategy either starts or continues a span, depending on whether tracing was already going on before the Hystrix command was called.
+Optionally, you can set <code>spring.sleuth.hystrix.strategy.passthrough</code> to <code>true</code> to just propagate the trace context to the Hystrix execution thread if you don&#8217;t wish to start a new span.
 To disable the custom Hystrix Concurrency Strategy, set the <code>spring.sleuth.hystrix.strategy.enabled</code> to <code>false</code>.</p>
 </div>
 </div>