Merge branch '1.5.x' into 2.0.x

2019-06-04 00:05:57 -07:00
parent eb9ffd5e7e e61f7a33a7
commit 5fba43aa31
78 changed files with 90 additions and 78 deletions
--- a/spring-boot-samples/spring-boot-sample-actuator-log4j2/src/main/resources/log4j2.xml
+++ b/spring-boot-samples/spring-boot-sample-actuator-log4j2/src/main/resources/log4j2.xml
@@ -18,4 +18,4 @@
            <AppenderRef ref="Console"/>
        </Root>
    </Loggers>
-</Configuration>
+</Configuration>