Skip to content

Commit

Permalink
Merge branch '2.6.x' into 2.7.x
Browse files Browse the repository at this point in the history
Closes gh-32291
  • Loading branch information
snicoll committed Sep 10, 2022
2 parents fd808ba + 42db66c commit 04a668f
Showing 1 changed file with 2 additions and 2 deletions.
Expand Up @@ -105,8 +105,8 @@ Spring Boot will automatically find and load `application.properties` and `appli
.. The classpath `/config` package
. From the current directory
.. The current directory
.. The `/config` subdirectory in the current directory
.. Immediate child directories of the `/config` subdirectory
.. The `config/` subdirectory in the current directory
.. Immediate child directories of the `config/` subdirectory

The list is ordered by precedence (with values from lower items overriding earlier ones).
Documents from the loaded files are added as `PropertySources` to the Spring `Environment`.
Expand Down

0 comments on commit 04a668f

Please sign in to comment.