root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

Browse Source
pull/9497/merge
Andy Wilkinson 7 years ago
parent 3ba53a4c6f 144d987cb8
commit bc5e4418ea
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File

3
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
Unescape Escape View File

@ -561,7 +561,8 @@ Config locations are searched in reverse order. By default, the configured locat
When custom config locations are configured, they are used in addition to the default When custom config locations are configured, they are used in addition to the default
locations. Custom locations are searched before the default locations. For example, locations. Custom locations are searched before the default locations. For example,
if custom locations `classpath:/custom-config/,file:./custom-config/` are configured, the search order becomes: if custom locations `classpath:/custom-config/,file:./custom-config/` are configured,
the search order becomes:
1. `file:./custom-config/` 1. `file:./custom-config/`
2. `classpath:custom-config/` 2. `classpath:custom-config/`

Write Preview
Loading…
Cancel
Save