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 49822 and 52217 #54977

Merged
merged 12 commits into from Jan 6, 2020
Merged

master-port 49822 and 52217 #54977

merged 12 commits into from Jan 6, 2020

Conversation

mchugh19
Copy link
Contributor

@mchugh19 mchugh19 commented Oct 12, 2019

What does this PR do?

Ports #49822 and #52217 to master branch

Tests written?

Yes - as originally included

Note: this includes the release notes from Neon as of when this was committed. Might be a conflict'y item in this process.

@mchugh19 mchugh19 changed the title master-port 49822 master-port 49822 and 52217 Oct 13, 2019
@waynew waynew added this to PR needs merge to master in PRs to port to master Oct 17, 2019
@waynew waynew self-assigned this Nov 5, 2019
Copy link
Contributor

@waynew waynew left a comment

Thanks for the PR! Code looks great - a couple of questions about the comments, though.

doc/topics/releases/neon.rst Outdated Show resolved Hide resolved
salt/modules/xml.py Outdated Show resolved Hide resolved
salt/states/xml.py Outdated Show resolved Hide resolved
@waynew waynew added the Pending-Discussion label Nov 6, 2019
doc/topics/releases/neon.rst Outdated Show resolved Hide resolved
@mchugh19 mchugh19 requested a review from as a code owner Nov 7, 2019
@ghost ghost requested a review from Akm0d Nov 7, 2019
Copy link
Contributor

@waynew waynew left a comment

I think code-wise, this looks good now. Just a couple of tweaks and it looks ready for merge.

Copy link
Contributor

@waynew waynew left a comment

One final change(?)

tests/unit/states/test_xml.py Outdated Show resolved Hide resolved
tests/unit/modules/test_xml.py Outdated Show resolved Hide resolved
@mchugh19
Copy link
Contributor Author

@mchugh19 mchugh19 commented Jan 4, 2020

test failures appear to be unrelated to this PR

@dwoz dwoz merged commit ac44cf3 into saltstack:master Jan 6, 2020
47 of 49 checks passed
PRs to port to master automation moved this from PR needs merge to master to PR merged Jan 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
master-port Pending-Discussion
Projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants