spring-boot/spring-boot-autoconfigure
Stephane Nicoll 763a735bd5 Merge branch '1.1.x'
Conflicts:
	spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointMBeanExportProperties.java
	spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java
2015-01-29 16:45:00 +01:00
..
src Merge branch '1.1.x' 2015-01-29 16:45:00 +01:00
.gitignore Restore test classes 2014-06-01 13:11:25 +01:00
pom.xml Allow XA DataSource and ConnFactory pools to be configured via the env 2015-01-27 10:55:56 +00:00