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

Fix returners not loading properly #54731

Merged
merged 4 commits into from Sep 26, 2019

Conversation

@pizzapanther
Copy link
Contributor

commented Sep 24, 2019

What does this PR do?

The __new__ method was removed from the parent class so it must be removed here too, to load the returner properly.

So I:

  • removed __new__
  • always import salt.minion. Since the import changed from __new__ to __init__ you seem to need it always for every platform now. Also doesn't hurt to load it anyways.

Tests written?

No

Commits signed with GPG?

Yes

@s0undt3ch s0undt3ch force-pushed the pizzapanther:not-so-__new__-and-shiny branch from a0a72a1 to c5bfbef Sep 25, 2019
@s0undt3ch

This comment has been minimized.

Copy link
Member

commented Sep 25, 2019

Tests are in

@s0undt3ch s0undt3ch force-pushed the pizzapanther:not-so-__new__-and-shiny branch from c5bfbef to bdf24f4 Sep 25, 2019
@waynew
waynew approved these changes Sep 25, 2019
@dwoz dwoz merged commit 46bec3c into saltstack:2019.2.1 Sep 26, 2019
24 checks passed
24 checks passed
WIP Ready for review
Details
ci/docs This commit looks good
Details
ci/lint This commit looks good
Details
ci/py2/amazon2 This commit looks good
Details
ci/py2/centos6 This commit looks good
Details
ci/py2/centos7 This commit looks good
Details
ci/py2/centos7/tcp This commit looks good
Details
ci/py2/debian8 This commit looks good
Details
ci/py2/debian9 This commit looks good
Details
ci/py2/fedora29 This commit looks good
Details
ci/py2/ubuntu1604 This commit looks good
Details
ci/py2/ubuntu1604/tcp This commit looks good
Details
ci/py2/ubuntu1804 This commit looks good
Details
ci/py2/windows2016 This commit looks good
Details
ci/py3/amazon2 This commit looks good
Details
ci/py3/centos7 This commit looks good
Details
ci/py3/centos7/tcp This commit looks good
Details
ci/py3/debian8 This commit looks good
Details
ci/py3/debian9 This commit looks good
Details
ci/py3/fedora29 This commit looks good
Details
ci/py3/ubuntu1604 This commit looks good
Details
ci/py3/ubuntu1604/tcp This commit looks good
Details
ci/py3/ubuntu1804 This commit looks good
Details
ci/py3/windows2016 This commit looks good
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.