Fixed prepending of root_dir override to the other paths #38707
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
|
ping @Ch3LL |
|
This fix is for |
|
Any thoughts on this? |
|
Sorry about the delay there, @alexbleotu. It's merged now. :] Thank you! |
|
(And yes, this will be merged forward into develop in the next few days.) |
|
Thanks @cachedout |
|
@alexbleotu I have had to revert this because many tests broke and it's blocking the release. We need to re-open this and take another crack at it. |
|
@cachedout sorry about that, will take another look tomorrow. The tests
were probably disabled on my system cause I had no failures. Unfortunately,
tests didn't run automatically on the branch for whatever reason.
…On 17 Jan 2017 23:18, "Mike Place" ***@***.***> wrote:
@alexbleotu <https://github.com/alexbleotu> I have had to revert this
because many tests broke and it's blocking the release. We need to re-open
this and take another crack at it.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#38707 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AQOKgee0ivY4z5ubwLKv4EMNbLdVThuAks5rTUxegaJpZM4LhwDh>
.
|
|
@alexbleotu Yes, that was my fault. We had a Jenkins outage and I was in a rush with the release. Apologies. Thanks for taking another swing at this one. :] |
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?
Fixed prepending of root_dir override to the other paths
What issues does this PR fix or reference?
#38663
Previous Behavior
root_dirin config was added to defaultroot dir, if default overrides existed in_syspaths.pyNew Behavior
Just the
root_dirin the config is used if defined, otherwise the defaultroot_dirTests written?
No (existing tests work with new code)
Please review Salt's Contributing Guide for best practices.