Fix jinja search path for local file_client #18860
Merged
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
Now that FS backends other than roots work with a local file_client, there is no need to look only in the file_roots directories. Fixes saltstack#17963.
|
Test Failed. If the failures are unrelated to your code, don't stress, a core developer will know these apart. |
These tests were using the now-outdated method of looking in the file_roots for cached templates in masterless mode.
|
The tests should now be fixed, waiting on Jenkins results. |
|
Test PASSed. |
thatch45
added a commit
that referenced
this pull request
Dec 11, 2014
Fix jinja search path for local file_client
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.
This is a re-opening of #18792, which was merged by accident. It has some
test failures that need to be resolved before it is merged.
Now that FS backends other than roots work with a local file_client, there is
no need to look only in the file_roots directories.
Fixes #17963.