Merge branch '1.1.x'

2014-09-25 10:05:35 -07:00
parent 55a84c7bd7 336b96b81c
commit 0d0e5eb590
13 changed files with 183 additions and 6 deletions
--- a/spring-boot-samples/spring-boot-sample-actuator/src/main/resources/application.properties
+++ b/spring-boot-samples/spring-boot-sample-actuator/src/main/resources/application.properties
@@ -1,6 +1,7 @@
 logging.file: /tmp/logs/app.log
 logging.level.org.springframework.security: INFO
 management.address: 127.0.0.1
+#management.port: 8181
 endpoints.shutdown.enabled: true
 server.tomcat.basedir: target/tomcat
 server.tomcat.access_log_enabled: true