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.7.x' into 3.0.x 

Closes gh-37252
This commit is contained in:
Moritz Halbritter 2023-09-08 11:17:25 +02:00
parent dcd16433c5 0004f035cf
commit bbc10856ee
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

@ -1599,6 +1599,13 @@
"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",
"type": "java.time.Duration",
@ -2132,6 +2139,10 @@
"name": "management.server.ssl.trust-store-type",
"description": "Type of the trust store."
},
{
"name": "management.signalfx.metrics.export.published-histogram-type",
"defaultValue": "default"
},
{
"name": "management.simple.metrics.export.mode",
"defaultValue": "cumulative"