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

refresh_pillar() should be called always with refresh=True during saltutil.sync_all #37521

Merged
merged 1 commit into from
Nov 7, 2016
Merged

Conversation

genuss
Copy link
Contributor

@genuss genuss commented Nov 7, 2016

What does this PR do?

After merging #25361 and #33833 it looks like the latter changes have overwritten the former and now pillar is refreshed only while running in masterless mode.
This PR aims to restore the behavior specified in #25297

Tests written?

No

@cachedout cachedout merged commit c2984a9 into saltstack:develop Nov 7, 2016
@genuss
Copy link
Contributor Author

genuss commented Nov 8, 2016

Thank you! Will it be included in 2016.3.x and upcoming 2016.11 releases?

@rallytime
Copy link
Contributor

@genuss I have back-ported your change to the 2016.3 branch, which will also be merged-forward to the 2016.11 branch.

@rallytime rallytime added the ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch. label Nov 8, 2016
cachedout pushed a commit that referenced this pull request Nov 8, 2016
@genuss
Copy link
Contributor Author

genuss commented Nov 9, 2016

Thank you @rallytime !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants