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

@garethgreenaway garethgreenaway 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 as a code owner Jul 24, 2019
@pull-assigner pull-assigner bot requested a review from xeacott Jul 24, 2019
@dwoz
Copy link
Contributor

@dwoz dwoz commented Aug 7, 2019

re-run full all

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 ====')
Copy link
Contributor

@twangboy twangboy Aug 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.
Copy link
Contributor

@twangboy twangboy Aug 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably need to remove the

@dwoz
Copy link
Contributor

@dwoz dwoz 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
oliverisaac added a commit to oliverisaac/salt that referenced this issue Oct 16, 2019
…ts__ for the matches when a local variable opts had already been defined.

Signed-off-by: Oliver Isaac <oisaac@gmail.com>
@oliverisaac oliverisaac mentioned this pull request May 23, 2020
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants