Merge branch '1.5.x'
This commit is contained in:
commit
9624bf14c4
|
@ -94,6 +94,7 @@ public class DataSourceAutoConfiguration {
|
|||
}
|
||||
}
|
||||
|
||||
@Configuration
|
||||
@Conditional(EmbeddedDatabaseCondition.class)
|
||||
@ConditionalOnMissingBean({ DataSource.class, XADataSource.class })
|
||||
@Import(EmbeddedDataSourceConfiguration.class)
|
||||
|
|
|
@ -58,6 +58,7 @@ public class LocalDevToolsAutoConfiguration {
|
|||
/**
|
||||
* Local LiveReload configuration.
|
||||
*/
|
||||
@Configuration
|
||||
@ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled", matchIfMissing = true)
|
||||
static class LiveReloadConfiguration {
|
||||
|
||||
|
|
Loading…
Reference in New Issue