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

Revert "Revert "use the minion configured publish_port, not what is provided in auth payload"" #50089

Merged
merged 1 commit into from
Oct 18, 2018

Conversation

mattp-
Copy link
Contributor

@mattp- mattp- commented Oct 17, 2018

What does this PR do?

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.

Tests written?

N/A

Commits signed with GPG?

No

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

…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.
@ghost ghost self-requested a review October 17, 2018 02:03
@cachedout cachedout merged commit c2f97fb into saltstack:develop Oct 18, 2018
@Ch3LL Ch3LL added the has master-port port to master has been created label Dec 23, 2019
@Ch3LL Ch3LL mentioned this pull request Dec 23, 2019
dwoz added a commit that referenced this pull request Dec 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
has master-port port to master has been created
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants