Merge branch '2.0.x' into 2.1.x

pull/16247/head
Phillip Webb 6 years ago
commit f02887b6c6

@ -62,7 +62,7 @@ public class ScheduledTasksEndpointAutoConfigurationTests {
} }
@Configuration @Configuration
private static class CustomEndpointConfiguration { static class CustomEndpointConfiguration {
@Bean @Bean
public CustomEndpoint customEndpoint() { public CustomEndpoint customEndpoint() {

Loading…
Cancel
Save