Skip to content
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

Master port 52156 #56852

Merged
merged 5 commits into from
Apr 23, 2020
Merged

Master port 52156 #56852

merged 5 commits into from
Apr 23, 2020

Conversation

joechainz
Copy link

#52156

What does this PR do?

Implements longstanding request #8875 - allows for pillar relative includes

What issues does this PR fix or reference?

#8875 - there are probably others

Previous Behavior

A leading dot in a pillar include was a nop. If you had a pillar like:

foo/bar/baz.sls

include:

  • .bang
    That would not refer to foo/bar/bang.sls, but bang.sls at the pillar root.

New Behavior

Now leading dots in includes refer to relative imports 🎉

Tests written?

Yes

Commits signed with GPG?

Yes

@joechainz joechainz requested a review from a team as a code owner April 22, 2020 22:35
@ghost ghost requested review from waynew and removed request for a team April 22, 2020 22:35
@waynew
Copy link
Contributor

waynew commented Apr 22, 2020

I actually just ported this myself 😬 - #56851

@dwoz dwoz merged commit 4ae2572 into saltstack:master Apr 23, 2020
@sagetherage sagetherage added the ZRelease-Sodium retired label label May 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants