Commit 9ff372c9 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '2.3.x' into 2.4.x

Closes gh-26653
parents 4955c80d b5ebf836
......@@ -848,6 +848,12 @@
"sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
"description": "Comma-separated list of active profiles. Can be overridden by a command line switch."
},
{
"name": "spring.profiles.default",
"type": "java.lang.String",
"description": "Name of the profile to enable if no profile is active.",
"defaultValue": "default"
},
{
"name": "spring.profiles.include",
"type": "java.util.List<java.lang.String>",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment