Merge branch '1.5.x'

2016-12-30 18:01:59 +01:00
parent 22a384ac28 c903ff46a7
commit 4604bb7e8a
48 changed files with 180 additions and 193 deletions
--- a/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/application.properties
+++ b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/application.properties
@@ -1 +1 @@
-health.diskspace.enabled: false
+health.diskspace.enabled=false