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

master-port 50141 #54981

Merged
merged 8 commits into from Dec 11, 2019
Merged

master-port 50141 #54981

merged 8 commits into from Dec 11, 2019

Conversation

mchugh19
Copy link
Contributor

@mchugh19 mchugh19 commented Oct 13, 2019

What does this PR do?

Port #50141 to master. Includes tests for new functionality.

Tests written?

Yes

@waynew waynew added this to PR needs merge to master in PRs to port to master Oct 17, 2019
@dwoz
Copy link
Contributor

@dwoz dwoz commented Nov 13, 2019

@mchugh19 are you able to rebase this and resolve the conflicts?

@mchugh19 mchugh19 requested a review from as a code owner Nov 13, 2019
@ghost ghost requested a review from waynew Nov 13, 2019
@mchugh19
Copy link
Contributor Author

@mchugh19 mchugh19 commented Nov 13, 2019

Release notes conflict resolved!

dwoz
dwoz approved these changes Nov 14, 2019
@dwoz
Copy link
Contributor

@dwoz dwoz commented Nov 14, 2019

@mchugh19 Thanks! I've resolve the linter complaints. We'll get this merged after the tests run again.

@dwoz dwoz merged commit 6892e85 into saltstack:master Dec 11, 2019
49 checks passed
PRs to port to master automation moved this from PR needs merge to master to PR merged Dec 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

None yet

2 participants