Merge branch '1.5.x'

This commit is contained in:
Phillip Webb
2016-11-28 15:37:43 -08:00
14 changed files with 39 additions and 34 deletions

View File

@@ -60,7 +60,6 @@ public class TestDatabaseAutoConfigurationTests {
DataSource datasource = this.context.getBean(DataSource.class);
JdbcTemplate jdbcTemplate = new JdbcTemplate(datasource);
jdbcTemplate.execute("create table example (id int, name varchar);");
ConfigurableApplicationContext anotherContext = doLoad(
ExistingDataSourceConfiguration.class);
try {