Merge branch '2.1.x'

2019-06-04 02:08:00 -07:00
parent 2b51cf442e ccfbd03482
commit d306b31ce9
107 changed files with 130 additions and 112 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