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

@@ -214,27 +214,6 @@
"deprecation": {
"replacement": "spring.info.git.location"
}
},
{
"name": "spring.pid.file",
"type": "java.lang.String",
"description": "Location of the PID file to write (if ApplicationPidFileWriter is used).",
"sourceType": "org.springframework.boot.actuate.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.actuate.system.ApplicationPidFileWriter"
},
{
"name": "spring.pidfile",
"type": "java.lang.String",
"description": "Location of the PID file to write (if ApplicationPidFileWriter is used).",
"sourceType": "org.springframework.boot.actuate.system.ApplicationPidFileWriter",
"deprecation": {
"replacement": "spring.pid.file"
}
}
],"hints": [
{