Merge branch '1.1.x'

2014-08-06 15:07:33 +01:00
parent 7f9ef1cf5b 7d213950ad
commit ce02e86b89
4 changed files with 60 additions and 18 deletions
--- a/spring-boot-autoconfigure/src/test/resources/data.sql
+++ b/spring-boot-autoconfigure/src/test/resources/data.sql
@@ -0,0 +1 @@
+INSERT INTO BAR VALUES (1, 'Andy');
--- a/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/data.sql
+++ b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/data.sql
@@ -0,0 +1 @@
+INSERT INTO FOO VALUES (1, 'Andy');