Skip to content

Commit 92bff3c

Browse files
committedJun 29, 2019
Merge branch '2.0.x' into 2.1.x
2 parents 6425fb6 + cfeb023 commit 92bff3c

File tree

343 files changed

+338
-140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

343 files changed

+338
-140
lines changed
 

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointProperties.java

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
* Configuration properties for {@link HealthEndpoint}.
2828
*
2929
* @author Phillip Webb
30+
* @since 2.0.0
3031
*/
3132
@ConfigurationProperties("management.endpoint.health")
3233
public class HealthEndpointProperties {

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseyChildManagementContextConfiguration.java

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
* management context with a web server running on a different port is required.
3232
*
3333
* @author Madhura Bhave
34+
* @since 2.1.0
3435
*/
3536
@ManagementContextConfiguration(ManagementContextType.CHILD)
3637
@Import(JerseyManagementContextConfiguration.class)

0 commit comments

Comments
 (0)
Please sign in to comment.