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

Back-port #33948 to 2016.3 + add log message #34009

Merged
merged 4 commits into from
Jun 16, 2016

Conversation

rallytime
Copy link
Contributor

What does this PR do?

Back-ports #33948 to the 2016.3 branch. This also adds some logic to detect if a returner does not have the minions kwarg present in it's save_load function, which can happen when users are using custom returners.

Instead of updating the release notes for Carbon as in the original PR, this adds a note to the 2016.3.2 release notes.

A separate PR for 2015.8 backport will follow.

ping @thatch45 and @cachedout

Mike Place and others added 4 commits June 14, 2016 10:30
We were doing an extra and unecessary full traversal of the minion
cache. This refactors all returners and the master to reduce this
to a single call. More work will be forthcoming to reduce this even
further, especially in the context of auth lookups.
@rallytime rallytime added the ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch. label Jun 14, 2016
thatch45 added a commit that referenced this pull request Jun 16, 2016
@thatch45 thatch45 merged commit dd26d6f into saltstack:2016.3 Jun 16, 2016
@rallytime rallytime deleted the bp-33948 branch June 16, 2016 21:17
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.

2 participants