Merge branch '2.0.x' into 2.1.x

2019-06-04 02:07:14 -07:00
parent d057f49618 b442d3b906
commit ccfbd03482
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