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

[2017.7] Backporting #47843 #47983

Merged
merged 2 commits into from Jun 6, 2018

Conversation

Projects
None yet
2 participants
@garethgreenaway
Member

garethgreenaway commented Jun 5, 2018

What does this PR do?

Backporting #47843 to 2017.7, updating test for 2017.7.

What issues does this PR fix or reference?

N/A

Tests written?

Yes

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 rallytime Jun 5, 2018

@garethgreenaway garethgreenaway force-pushed the garethgreenaway:backport_47843_2017_7 branch from 6e04e2a to 1c1bbeb Jun 5, 2018

@rallytime

@garethgreenaway It looks like the test isn't quite right here. Can you take another look?

@rallytime

This comment has been minimized.

Contributor

rallytime commented Jun 6, 2018

@garethgreenaway Ah, probably because it's missing the issue30367 sls file.

garethgreenaway added some commits Jun 5, 2018

@garethgreenaway garethgreenaway force-pushed the garethgreenaway:backport_47843_2017_7 branch from 1c1bbeb to 7b7fb1f Jun 6, 2018

@garethgreenaway

This comment has been minimized.

Member

garethgreenaway commented Jun 6, 2018

@rallytime That looks like it was the issue. Added the missing file back in.

@rallytime rallytime merged commit b81d482 into saltstack:2017.7 Jun 6, 2018

6 of 9 checks passed

jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #5545 — FAILURE
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #19600 — FAILURE
Details
default Build started sha1 is merged.
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #25743 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #17810 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #23477 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #10517 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #22441 — SUCCESS
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment