Merge branch '1.5.x' into 2.0.x

2019-06-28 23:27:59 -07:00
parent 4f079803d2 d91f27e11f
commit cfeb0239b7
342 changed files with 332 additions and 139 deletions
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointProperties.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointProperties.java
@@ -27,6 +27,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 * Configuration properties for {@link HealthEndpoint}.
 *
 * @author Phillip Webb
+ * @since 2.0.0
 */
@ConfigurationProperties("management.endpoint.health")
 public class HealthEndpointProperties {