root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
spring-boot/spring-boot-actuator/src
History
Phillip Webb 938609fdc0 Merge branch '1.0.x' 
Conflicts:
	spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java
	spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
 		2014-05-15 16:35:43 +01:00
..
main Merge branch '1.0.x' 2014-05-15 16:35:43 +01:00
test Integrate @ConfigurationProperties @Beans with DataSource configuration 2014-05-13 16:46:04 +01:00