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 #50089 #55730

Merged
merged 2 commits into from
Dec 24, 2019
Merged

Master Port #50089 #55730

merged 2 commits into from
Dec 24, 2019

Conversation

Ch3LL
Copy link
Contributor

@Ch3LL Ch3LL commented Dec 23, 2019

Master Port for #50089

Need this for heist to work properly.

mattp- and others added 2 commits December 23, 2019 13:04
…rovided in auth payload""

This restores original commit a0d723f,
alongside some changes in tests.integration syndic config generation
that was actually subtly doing the wrong thing and copying from a base
of the base master, not syndic master config.

Conflicts:
  - tests/integration/__init__.py
@Ch3LL Ch3LL requested a review from a team as a code owner December 23, 2019 21:59
@ghost ghost requested a review from dwoz December 23, 2019 21:59
@Ch3LL Ch3LL added the ZRELEASED - Neon retired label label Dec 23, 2019
@dwoz dwoz merged commit 2600168 into saltstack:master Dec 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants