From 7d61d04020d1156f5a4d2ef4eeef4c11450c0b55 Mon Sep 17 00:00:00 2001
From: buildmaster <buildmaster@springframework.org>
Date: Tue, 20 Dec 2016 17:26:28 +0000
Subject: [PATCH] Sync docs from 1.1.x to gh-pages

---
 1.1.x/index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/1.1.x/index.html b/1.1.x/index.html
index 5aa6f6c07..9f78cedaf 100644
--- a/1.1.x/index.html
+++ b/1.1.x/index.html
@@ -849,7 +849,7 @@ we&#8217;re passing the dependencies in the <code>groupId:artifactId:version</co
 	&lt;property name="LOG_FILE" value="${BUILD_FOLDER:-build}/${springAppName}"/&gt;​
 
 	&lt;property name="CONSOLE_LOG_PATTERN"
-			  value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr([${springAppName:-},%X{X-B3-TraceId:-},%X{X-B3-SpanId:-},%X{X-Span-Export:-}]){yellow} %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/&gt;
+			  value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr([${springAppName:-},%X{X-B3-TraceId:-},%X{X-B3-SpanId:-},%X{X-B3-ParentSpanId:-},%X{X-Span-Export:-}]){yellow} %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/&gt;
 
 	&lt;!-- Appender to log to console --&gt;
 	&lt;appender name="console" class="ch.qos.logback.core.ConsoleAppender"&gt;
@@ -895,6 +895,7 @@ we&#8217;re passing the dependencies in the <code>groupId:artifactId:version</co
 						"service": "${springAppName:-}",
 						"trace": "%X{X-B3-TraceId:-}",
 						"span": "%X{X-B3-SpanId:-}",
+						"parent": "%X{X-B3-ParentSpanId:-}",
 						"exportable": "%X{X-Span-Export:-}",
 						"pid": "${PID:-}",
 						"thread": "%thread",