Merge '1.5.x'

2016-10-21 10:25:07 -07:00
parent 1e1d929dde 2ba978b4ad
commit df3c152813
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/AbstractEndpointHandlerMapping.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/AbstractEndpointHandlerMapping.java
@@ -212,7 +212,7 @@ public class AbstractEndpointHandlerMapping<E extends MvcEndpoint>

 	/**
 	 * Returns if this mapping is disabled.
-	 * @return if the mapping is disabled
+	 * @return {@code true} if the mapping is disabled
 	 */
 	public boolean isDisabled() {
 		return this.disabled;