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

Merge branch '3.0.x' into 3.1.x 

Closes gh-37253
This commit is contained in:
Moritz Halbritter 2023-09-08 11:17:40 +02:00
parent 33faa8edf1 bbc10856ee
commit d9b7a8c0af
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1605,6 +1605,13 @@
"level": "error" "level": "error"
} }
}, },
{
"name": "management.metrics.export.signalfx.published-histogram-type",
"deprecation": {
"level": "error",
"replacement": "management.signalfx.metrics.export.published-histogram-type"
}
},
{ {
"name": "management.metrics.export.signalfx.read-timeout", "name": "management.metrics.export.signalfx.read-timeout",
"type": "java.time.Duration", "type": "java.time.Duration",
@ -2146,6 +2153,10 @@
"name": "management.server.ssl.trust-store-type", "name": "management.server.ssl.trust-store-type",
"description": "Type of the trust store." "description": "Type of the trust store."
}, },
{
"name": "management.signalfx.metrics.export.published-histogram-type",
"defaultValue": "default"
},
{ {
"name": "management.simple.metrics.export.mode", "name": "management.simple.metrics.export.mode",
"defaultValue": "cumulative" "defaultValue": "cumulative"