root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Andy Wilkinson 2018-10-12 11:25:17 +01:00
parent 2588a71ac4 861587ec78
commit 19232ad87a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnEnabledEndpoint.java
View File

@ -101,7 +101,7 @@ public @interface ConditionalOnEnabledEndpoint {
* The endpoint type that should be checked. Inferred when the return type of the * The endpoint type that should be checked. Inferred when the return type of the
* {@code @Bean} method is either an {@link Endpoint} or an {@link EndpointExtension}. * {@code @Bean} method is either an {@link Endpoint} or an {@link EndpointExtension}.
* @return the endpoint type to check * @return the endpoint type to check
* @since 2.1.0 * @since 2.0.6
*/ */
Class<?> endpoint() default Void.class; Class<?> endpoint() default Void.class;