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

Port #50168 to master #56881

Merged
merged 2 commits into from
May 12, 2020
Merged

Port #50168 to master #56881

merged 2 commits into from
May 12, 2020

Conversation

DmitryKuzmenko
Copy link
Contributor

Port #50168 to master

I've tried to rework it to resolve crossing with functionality added to master by DWoz in #54942.

Original comment:

Allow to refresh pillar synchronously
This PR adds the optional ability to run saltutil.refresh_pillar Allow to refresh pillar synchronously, saying saltutil.refresh_pillar async=False. I tried to follow the explanatory comment from @gtmanfred and I believe that this works, still I am not sure about the mentioned use of the _gather_pillar() method. I am happy to rework the PR if something is missing.

@DmitryKuzmenko DmitryKuzmenko requested a review from a team as a code owner April 24, 2020 11:54
@ghost ghost requested review from cmcmarrow and removed request for a team April 24, 2020 11:54
@DmitryKuzmenko DmitryKuzmenko changed the title Port #50168 to master [WIP] Port #50168 to master Apr 24, 2020
salt/modules/saltutil.py Show resolved Hide resolved
@DmitryKuzmenko
Copy link
Contributor Author

@dwoz I've updated the code accordingly to your request.

afischer-opentext-com and others added 2 commits May 10, 2020 23:47
Allow to refresh pillar synchronously
This PR adds the optional ability to run saltutil.refresh_pillar Allow
to refresh pillar synchronously, saying saltutil.refresh_pillar
async=False. I tried to follow the explanatory comment from @gtmanfred
and I believe that this works, still I am not sure about the mentioned
use of the _gather_pillar() method. I am happy to rework the PR if
something is missing.

[DKuzmenko] I've slightly reworked it to resolve conflicts with
functionality added to master by DWoz in saltstack#54942.

Co-authored-by: Dmitry Kuzmenko <dmitry.kuzmenko@dsr-corporation.com>
Removed 'notify' argument.
Removed superfluous event send.
Minor updates
@dwoz dwoz merged commit 6eac672 into saltstack:master May 12, 2020
@sagetherage sagetherage added the ZRelease-Sodium retired label label May 18, 2020
@DmitryKuzmenko DmitryKuzmenko changed the title [WIP] Port #50168 to master Port #50168 to master Jun 9, 2020
@DmitryKuzmenko DmitryKuzmenko deleted the master-port-50168 branch October 23, 2020 14:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants