root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.3.x' 

Closes gh-22928
This commit is contained in:
Stephane Nicoll 2020-08-13 09:44:26 +02:00
parent 7c7079f91a d0662e824a
commit 947e484001
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,10 +48,6 @@
"name": "server.error.include-stacktrace", "name": "server.error.include-stacktrace",
"defaultValue": "never" "defaultValue": "never"
}, },
{
"name": "server.forward-headers-strategy",
"defaultValue": "ncsa"
},
{ {
"name": "server.http2.enabled", "name": "server.http2.enabled",
"description": "Whether to enable HTTP/2 support, if the current environment supports it.", "description": "Whether to enable HTTP/2 support, if the current environment supports it.",
@ -71,6 +67,10 @@
"level": "error" "level": "error"
} }
}, },
{
"name": "server.jetty.accesslog.format",
"defaultValue": "ncsa"
},
{ {
"name": "server.jetty.accesslog.locale", "name": "server.jetty.accesslog.locale",
"deprecation": { "deprecation": {