Merge branch '1.5.x' into 2.0.x

2018-05-25 18:45:37 -07:00
parent 606eb9dda3 e69296d7d3
commit 21d80d87a3
94 changed files with 401 additions and 341 deletions
--- a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/resources/application-scratch.properties
+++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/resources/application-scratch.properties
@@ -1,2 +1,2 @@
 spring.datasource.name=scratchdb
-spring.jmx.default-domain=jpa.sample
+spring.jmx.default-domain=jpa.sample