Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2017-06-02 17:58:18 +02:00
commit 9624bf14c4
2 changed files with 2 additions and 0 deletions

View File

@ -94,6 +94,7 @@ public class DataSourceAutoConfiguration {
}
}
@Configuration
@Conditional(EmbeddedDatabaseCondition.class)
@ConditionalOnMissingBean({ DataSource.class, XADataSource.class })
@Import(EmbeddedDataSourceConfiguration.class)

View File

@ -58,6 +58,7 @@ public class LocalDevToolsAutoConfiguration {
/**
* Local LiveReload configuration.
*/
@Configuration
@ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled", matchIfMissing = true)
static class LiveReloadConfiguration {