Merge branch '2.0.x' into 2.1.x

This commit is contained in:
Phillip Webb 2019-03-11 21:09:35 -07:00
commit 45ae97a4e9

View File

@ -169,7 +169,7 @@ public class ScheduledTasksEndpointTests {
@Configuration @Configuration
@EnableScheduling @EnableScheduling
private static class BaseConfiguration { static class BaseConfiguration {
@Bean @Bean
public ScheduledTasksEndpoint endpoint( public ScheduledTasksEndpoint endpoint(