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.

Sign up for GitHub

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

Jump to bottom

git_pillar: Fix all_saltenvs on base env #51661

Merged
merged 3 commits into from
Apr 18, 2019
Merged

git_pillar: Fix all_saltenvs on base env #51661

merged 3 commits into from
Apr 18, 2019

Conversation

sathieu
Copy link
Contributor

@sathieu sathieu commented Feb 15, 2019 •
edited
Loading

What does this PR do?

Fixes #50768.

What issues does this PR fix or reference?

PR #50768. This fix was too lake for 2018.3.4 (see #51597).

Previous Behavior

minion:
    Data failed to compile:
----------
    Pillar failed to render with the following messages:
----------
    Specified SLS 'projects.gitlab' in environment 'prod' is not available on the salt master

New Behavior

State applies succesfully.

Tests written?

Yes

Commits signed with GPG?

Yes

@sathieu
Copy link
Contributor Author

sathieu commented Feb 15, 2019

@terminalmage please review and merge.

@dwoz dwoz requested a review from terminalmage February 15, 2019 15:59
@dwoz
Copy link
Contributor

dwoz commented Mar 5, 2019

@sathieu are you able to write a test for this?

@sathieu
Copy link
Contributor Author

sathieu commented Mar 7, 2019

@dwoz:

@sathieu are you able to write a test for this?

In progress.

@sathieu sathieu force-pushed the fix50768_2018.3.5 branch from 02aa2d9 to 0c38fa8 Compare March 7, 2019 13:43
@sathieu sathieu force-pushed the fix50768_2018.3.5 branch from 0c38fa8 to 9a50106 Compare March 15, 2019 16:18
@sathieu sathieu force-pushed the fix50768_2018.3.5 branch from 9a50106 to fd0edb1 Compare March 20, 2019 20:26
@sathieu
Copy link
Contributor Author

sathieu commented Mar 20, 2019

@dwoz I've written tests. Please merge.

@sathieu
Copy link
Contributor Author

sathieu commented Apr 18, 2019

This bugfix PR is waiting to be merged in 2018.3 (for 2018.3.5) and needs to go in 2019.2.1 too.

@twangboy twangboy added v2019.2.1 unsupported version bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch labels Apr 18, 2019
@twangboy twangboy merged commit 1d17f38 into saltstack:2018.3 Apr 18, 2019
@twangboy twangboy mentioned this pull request Apr 18, 2019
Merged
@Ch3LL Ch3LL added ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch. and removed bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch labels Apr 25, 2019
@sathieu sathieu mentioned this pull request Jan 9, 2020
Open
@sathieu
Copy link
Contributor Author

sathieu commented May 14, 2020

@garethgreenaway This one is already merged in master, per #51661, please tag accordingly

@sathieu sathieu deleted the fix50768_2018.3.5 branch May 14, 2020 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@twangboy twangboy twangboy approved these changes

@terminalmage terminalmage Awaiting requested review from terminalmage

Assignees
No one assigned
Labels
v2019.2.1 unsupported version ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sathieu @dwoz @twangboy @Ch3LL