Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

Browse Source 
Closes gh-10457
This commit is contained in:
Andy Wilkinson
2017-10-02 15:24:12 +01:00
parent ec6659db2e d94f545b4d
commit 41424e4529
27 changed files with 116 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View File

@@ -1249,7 +1249,7 @@ content into your application; rather pick only the properties that you need.
management.health.rabbit.enabled=true # Enable RabbitMQ health check.
management.health.redis.enabled=true # Enable Redis health check.
management.health.solr.enabled=true # Enable Solr health check.
management.health.status.http-mapping= # Mapping of health statuses to HttpStatus codes. By default, registered health statuses map to sensible defaults (i.e. UP maps to 200).
management.health.status.http-mapping= # Mapping of health statuses to HTTP status codes. By default, registered health statuses map to sensible defaults (i.e. UP maps to 200).
management.health.status.order=DOWN, OUT_OF_SERVICE, UP, UNKNOWN # Comma-separated list of health statuses in order of severity.
# INFO CONTRIBUTORS ({sc-spring-boot-actuator}/autoconfigure/info/InfoContributorProperties.{sc-ext}[InfoContributorProperties])

2
spring-boot-docs/src/main/asciidoc/howto.adoc
View File

@@ -1836,7 +1836,7 @@ respectively.
Spring Data REST can expose the `Repository` implementations as REST endpoints for you as
long as Spring MVC has been enabled for the application.
Spring Boot exposes as set of useful properties from the `spring.data.rest` namespace that
Spring Boot exposes a set of useful properties from the `spring.data.rest` namespace that
customize the
{spring-data-rest-javadoc}/core/config/RepositoryRestConfiguration.{dc-ext}[`RepositoryRestConfiguration`].
If you need to provide additional customization, you should use a

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

@@ -114,7 +114,7 @@ The following technology agnostic endpoints are available:
|Allows the application to be gracefully shutdown (not enabled by default).
|`status`
|Show application status information (i.e. `health` status with no additional details)
|Show application status information (i.e. `health` status with no additional details).
|`threaddump`
|Performs a thread dump.
@@ -393,7 +393,7 @@ to your application properties:
The HTTP status code in the response reflects the overall health status (e.g. `UP`
maps to 200, `OUT_OF_SERVICE` or `DOWN` to 503). You might also want to register custom
status mappings if you access the health endpoint over HTTP. For example, the following
maps `FATAL` to `HttpStatus.SERVICE_UNAVAILABLE`:
maps `FATAL` to 503 (service unavailable).
[source,properties,indent=0]
----

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

@@ -1903,7 +1903,7 @@ You can also customize the static resource locations using
`spring.resources.static-locations` (replacing the default values with a list
of directory locations). The root Servlet context path `"/"` will be automatically
added as a location as well. If you do this the default welcome page detection will
switch to your custom locations, so if there is an `index.html` in any of your locations
switch to your custom locations. So if there is an `index.html` in any of your locations
on startup, it will be the home page of the application.
In addition to the '`standard`' static resource locations above, a special case is made