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

[2019.2.1] Porting metaproxy changes in #50183 to 2019.2.1 #54001

Merged
merged 7 commits into from Aug 8, 2019

Conversation

@garethgreenaway
Copy link
Member

commented Jul 24, 2019

What does this PR do?

Porting metaproxy changes in #50183 to 2019.2.1

What issues does this PR fix or reference?

N/A

Tests written?

[NOTICE] Bug fixes or features added to Salt require tests.
Please review the test documentation for details on how to implement tests into Salt's test suite.
Yes. Proxy tests exist.

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

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

@garethgreenaway garethgreenaway requested a review from saltstack/team-core as a code owner Jul 24, 2019
@pull-assigner pull-assigner bot requested a review from xeacott Jul 24, 2019
…ects are created.
@dwoz

This comment has been minimized.

Copy link
Contributor

commented Aug 7, 2019

re-run full all

…alt into add_metaproxy_2019_2_1
@dwoz
dwoz approved these changes Aug 8, 2019
@@ -3301,6 +3307,21 @@ def _create_minion_object(self, opts, timeout, safe,
jid_queue=jid_queue)


def _metaproxy_call(opts, fn_name):
log.debug('=== here ====')

This comment has been minimized.

Copy link
@twangboy

twangboy Aug 8, 2019

Contributor

Is this leftover from some debugging?

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
'''
This is a dummy proxy-minion designed for testing the proxy minion subsystem.
This is the a dummy proxy-minion designed for testing the proxy minion subsystem.

This comment has been minimized.

Copy link
@twangboy

twangboy Aug 8, 2019

Contributor

Probably need to remove the

@dwoz

This comment has been minimized.

Copy link
Contributor

commented Aug 8, 2019

@twangboy In the interest of making progress towards the release I am going to merge this.

@garethgreenaway Please make another PR to resolve @twangboy's comments.

@dwoz dwoz merged commit 584e3f2 into saltstack:2019.2.1 Aug 8, 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
oliverisaac added a commit to oliverisaac/salt that referenced this pull request Oct 16, 2019
…ts__ for the matches when a local variable opts had already been defined.

Signed-off-by: Oliver Isaac <oisaac@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.