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 self-assigned this Nov 5, 2019
Copy link
Contributor

@waynew waynew left a comment

Choose a reason for hiding this comment

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

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 The issue or pull request needs more discussion before it can be closed or merged label Nov 6, 2019
doc/topics/releases/neon.rst Outdated Show resolved Hide resolved
@mchugh19 mchugh19 requested a review from a team as a code owner November 7, 2019 19:17
@ghost ghost requested a review from Akm0d November 7, 2019 19:17
Copy link
Contributor

@waynew waynew left a comment

Choose a reason for hiding this comment

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

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

Choose a reason for hiding this comment

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

One final change(?)

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

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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
master-port Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants