Merge branch '1.5.x'

8 years ago · f0d34250b0
parent 366031cfb6 f8de022f0a
commit f0d34250b0
1 changed files with 2 additions and 2 deletions
--- a/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
@ -388,7 +388,7 @@ to your application properties:

 [source,properties,indent=0]
 ----
-	management.health.status.order=DOWN, OUT_OF_SERVICE, UNKNOWN, UP
+	management.health.status.order=FATAL, DOWN, OUT_OF_SERVICE, UNKNOWN, UP
 ----

 The HTTP status code in the response reflects the overall health status (e.g. `UP`
@ -398,7 +398,7 @@ For example, the following maps `FATAL` to `HttpStatus.SERVICE_UNAVAILABLE`:

 [source,properties,indent=0]
 ----
-	endpoints.health.mappings.FATAL=503
+	endpoints.health.mapping.FATAL=503
 ----