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:
Stephane Nicoll 2018-04-16 08:10:17 +02:00
parent 982a110fc1 369856dd2a
commit 0fd743cdb1
2 changed files with 2 additions and 2 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/security/reactive/EndpointRequest.java
View File

@ -240,7 +240,7 @@ public final class EndpointRequest {
}
/**
* The The {@link ServerWebExchangeMatcher} used to match against the links endpoint.
* The {@link ServerWebExchangeMatcher} used to match against the links endpoint.
*/
public static final class LinksServerWebExchangeMatcher
extends ApplicationContextServerWebExchangeMatcher<WebEndpointProperties> {

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/ServletEndpoint.java
View File

@ -33,7 +33,7 @@ import org.springframework.core.annotation.AliasFor;
* Implementations must also implement {@link Supplier Supplier&lt;EndpointServlet&gt;}
* and return a valid {@link EndpointServlet}.
* <p>
* This annotation can be used when existing servlets need be be exposed as actuator
* This annotation can be used when existing servlets need to be exposed as actuator
* endpoints, but it is at the expense of portability. Most users should prefer the
* {@link Endpoint @Endpoint} or {@link WebEndpoint @WebEndpoint} annotations whenever
* possible.