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.1.x' into 2.2.x 

Closes gh-20618
This commit is contained in:
Stephane Nicoll 2020-03-23 14:22:30 +01:00
parent 39b965e1fd bcce6f9f07
commit 7be3db2d4d
2 changed files with 3 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/asciidoc/index.adoc
View File

@ -23,7 +23,7 @@ Before you proceed, you should read the following topics:
* <<overview-endpoint-urls>>
* <<overview-timestamps>>
NOTE: In order to get the correct JSON responses documented below, Jackson must be available.
[[overview-endpoint-urls]]
=== URLs

2
spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
View File

@ -1001,6 +1001,8 @@ For example, `health` is exposed as `/actuator/health`.
TIP: Actuator is supported natively with Spring MVC, Spring WebFlux, and Jersey.
If both Jersey and Spring MVC are available, Spring MVC will be used.
NOTE: Jackson is a required dependency in order to get the correct JSON responses as documented in the API documentation ({spring-boot-actuator-restapi}/html[HTML] or {spring-boot-actuator-restapi}/pdf/spring-boot-actuator-web-api.pdf[PDF]).
[[production-ready-customizing-management-server-context-path]]