spring-boot/spring-boot-autoconfigure
Phillip Webb 3328c1369f Merge branch '1.1.x'
Conflicts:
	spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java
2015-02-01 20:28:11 -08:00
..
src Merge branch '1.1.x' 2015-02-01 20:28:11 -08: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