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

Merge 2015.5 into 2015.8 #31312

Merged
merged 13 commits into from Feb 18, 2016

Conversation

terminalmage
Copy link
Contributor

No description provided.

terminalmage and others added 13 commits February 8, 2016 22:45
This prevents the pkg.check_db call if 0.1.15 is not able to be
installed.
In the interest of not making salt.utils any more cluttered.
When using a named external_ip, an exception was thrown every time.
Updated the __create_orget_address call and return variable to use
the correct variable.
fix if_missing gets appended to dirs list, take III
(2015.5 branch) yumpkg: ensure that dnf-plugins-core >= 0.1.15 is installed
…ip-reservation

Fixed named external_ip reservation/re-use code in gce driver.
Improve salt.states.ssh_known_hosts documentation.
cachedout pushed a commit that referenced this pull request Feb 18, 2016
@cachedout cachedout merged commit 098f05e into saltstack:2015.8 Feb 18, 2016
@terminalmage terminalmage deleted the merge-forward-2015.5-2015.8 branch April 6, 2016 23:28
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

4 participants