Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Phillip Webb
2016-11-03 14:49:38 -07:00
12 changed files with 281 additions and 19 deletions

View File

@@ -25,6 +25,7 @@
<module>spring-boot-sample-activemq</module>
<module>spring-boot-sample-actuator</module>
<module>spring-boot-sample-actuator-log4j2</module>
<module>spring-boot-sample-actuator-no-security</module>
<module>spring-boot-sample-actuator-noweb</module>
<module>spring-boot-sample-actuator-ui</module>
<module>spring-boot-sample-amqp</module>