Phillip Webb 83bd36d8e0 Merge branch '1.1.x' ...

Conflicts:
	spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java

2014-08-18 13:02:44 -07:00

..

src

Merge branch '1.1.x'

2014-08-18 13:02:44 -07:00

.gitignore

Restore test classes

2014-06-01 13:11:25 +01:00

pom.xml

Add auto-configuration for Spring Cloud

2014-08-14 20:47:59 -07:00