Merge branch '2.1.x'

Closes gh-18118
2019-09-03 18:20:24 -07:00
parent c1a16f5f21 827c624b22
commit b43edf5493
2 changed files with 29 additions and 7 deletions
--- a/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml
+++ b/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--
-Default logback configuration provided for import, equivalent to the programmatic
-initialization performed by Boot
+Default logback configuration provided for import
 -->

 <included>