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-profile/src/main/resources/application.yml
+++ b/spring-boot-samples/spring-boot-sample-profile/src/main/resources/application.yml
@@ -4,4 +4,4 @@ name: Phil

 spring:
  profiles: goodbye,dev
-name: Everyone
+name: Everyone