Merge branch '2.0.x' into 2.1.x

philwebb · philwebb · commit f02887b6c6a3 · 2019-03-11T22:14:21.000-07:00
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksEndpointAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksEndpointAutoConfigurationTests.java
@@ -62,7 +62,7 @@ public void endpointBacksOffWhenUserProvidedEndpointIsPresent() {
 	}
 
 	@Configuration
-	private static class CustomEndpointConfiguration {
+	static class CustomEndpointConfiguration {
 
 		@Bean
 		public CustomEndpoint customEndpoint() {

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public void endpointBacksOffWhenUserProvidedEndpointIsPresent() {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`@Configuration`
`65`		`- private static class CustomEndpointConfiguration {`
	`65`	`+ static class CustomEndpointConfiguration {`
`66`	`66`
`67`	`67`	`@Bean`
`68`	`68`	`public CustomEndpoint customEndpoint() {`