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

docker_container.running: Fix regression in test mode #48653

Merged
merged 2 commits into from Jul 20, 2018

Conversation

Projects
None yet
2 participants
@terminalmage
Member

terminalmage commented Jul 18, 2018

In the process of overhauling docker_container.running to support network management for 2018.3.0, this line was deleted when it should not have been. Adding it back to ensure we exit the state at the proper place when state is run in test mode.

terminalmage and others added some commits Jul 18, 2018

docker_container.running: Fix regression in test mode
In the process of overhauling docker_container.running to support
network management for 2018.3.0, This line was deleted when it should
not have been. Adding it back to ensure we exit the state at the proper
place when state is run in test mode.

@rallytime rallytime merged commit 6a49420 into saltstack:2018.3 Jul 20, 2018

6 of 8 checks passed

jenkins/pr/py2-centos-7 running py2-centos-7...
Details
jenkins/pr/py3-centos-7 running py3-centos-7...
Details
WIP ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details

@terminalmage terminalmage deleted the terminalmage:docker-unboundlocal branch Jul 23, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment