-
Notifications
You must be signed in to change notification settings - Fork 5.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow file.recurse
to merge all existing source
dirs
#67073
Open
lkubb
wants to merge
2
commits into
saltstack:master
Choose a base branch
from
lkubb:feat/file-recurse-merge-sources
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
07feb8a
to
1d9a12f
Compare
1d9a12f
to
62b869f
Compare
62b869f
to
9b41fa7
Compare
9b41fa7
to
8193adf
Compare
8193adf
to
c475e30
Compare
ff5b6e5
to
17b92d7
Compare
cb10fa1
to
1091a7a
Compare
1091a7a
to
33779e0
Compare
33779e0
to
2a6d1bc
Compare
2a6d1bc
to
219fac8
Compare
219fac8
to
e8cfee9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Adds a
merge
parameter tofile.recurse
. When enabled, instead of selecting the first existing source, merges source directories recursively.What issues does this PR fix or reference?
Fixes: #67072
Fixes: #67766
Previous Behavior
Selects the first source only.
New Behavior
Can merge multiple sources.
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes