Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
258f1d6c
Commit
258f1d6c
authored
Dec 04, 2020
by
Madhura Bhave
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #24326 from dreis2211
* pr/24326: Fix Asciidoc build step Closes gh-24326
parents
97714005
b9ec88a7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
4 deletions
+10
-4
spring-boot-features.adoc
...ing-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
+10
-4
No files found.
spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
View file @
258f1d6c
...
@@ -733,14 +733,20 @@ For instance, the two examples below produce the same result:
...
@@ -733,14 +733,20 @@ For instance, the two examples below produce the same result:
[source,yaml,indent=0,configblocks]
[source,yaml,indent=0,configblocks]
----
----
spring.config.import=my.properties
spring:
my.property=value
config:
import: my.properties
my:
property: value
----
----
[source,yaml,indent=0,configblocks]
[source,yaml,indent=0,configblocks]
----
----
my.property=value
my:
spring.config.import=my.properties
property: value
spring:
config:
import: my.properties
----
----
In both of the above examples, the values from the `my.properties` file will take precedence over the file that triggered its import.
In both of the above examples, the values from the `my.properties` file will take precedence over the file that triggered its import.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment