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

Backport #30797 to 2015.8 #30888

Merged
merged 3 commits into from Feb 4, 2016
Merged

Conversation

ticosax
Copy link
Contributor

@ticosax ticosax commented Feb 4, 2016

This is a backport of #30797
so this fix will be in the next release of 2015.8

rhansen and others added 3 commits February 4, 2016 10:07
The unit tests now test for the bug fixed in the previous commit
(among other things).
Before, if the driver parameter wasn't specified, the dockerng state
module's volume_present() function would try to delete the volume and
recreate it.  Now it simply ignores the existing volume's driver
setting and returns success.

Note that this change assumes that if the driver is unspecified then
the user means "I don't care what the driver is", not "I care that the
driver matches the Docker default".
cachedout pushed a commit that referenced this pull request Feb 4, 2016
@cachedout cachedout merged commit 4ae2d82 into saltstack:2015.8 Feb 4, 2016
@ticosax ticosax deleted the backport-30797 branch February 5, 2016 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants