Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Stephane Nicoll 2016-12-14 19:09:18 +01:00
commit e002e03b3e

View File

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