Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll
2017-02-05 09:26:52 +01:00
4 changed files with 14 additions and 23 deletions

View File

@@ -125,7 +125,7 @@ content into your application; rather pick only the properties that you need.
# OUTPUT
spring.output.ansi.enabled=detect # Configure the ANSI output.
# PID FILE ({sc-spring-boot-actuator}/system/ApplicationPidFileWriter.{sc-ext}[ApplicationPidFileWriter])
# PID FILE ({sc-spring-boot}/system/ApplicationPidFileWriter.{sc-ext}[ApplicationPidFileWriter])
spring.pid.fail-on-write-error= # Fail if ApplicationPidFileWriter is used but it cannot write the PID file.
spring.pid.file= # Location of the PID file to write (if ApplicationPidFileWriter is used).

View File

@@ -1386,7 +1386,7 @@ writes a PID file. Example:
[indent=0]
----
org.springframework.context.ApplicationListener=\
org.springframework.boot.actuate.system.ApplicationPidFileWriter,\
org.springframework.boot.system.ApplicationPidFileWriter,\
org.springframework.boot.actuate.system.EmbeddedServerPortFileWriter
----