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

Merge branch '1.4.x' into 1.5.x

Browse Source
This commit is contained in:
Stephane Nicoll
2017-02-05 09:25:48 +01:00
parent b9b0cdb342 21e866535c
commit 3d1f8aa8d7
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@@ -182,6 +182,18 @@
"description": "Configure the ANSI output.",
"defaultValue": "detect"
},
{
"name": "spring.pid.file",
"type": "java.lang.String",
"description": "Location of the PID file to write (if ApplicationPidFileWriter is used).",
"sourceType": "org.springframework.boot.system.ApplicationPidFileWriter"
},
{
"name": "spring.pid.fail-on-write-error",
"type": "java.lang.Boolean",
"description": "Fail if ApplicationPidFileWriter is used but it cannot write the PID file.",
"sourceType": "org.springframework.boot.system.ApplicationPidFileWriter"
},
{
"name": "spring.profiles.active",
"type": "java.util.List<java.lang.String>",