[2016.3] Merge forward from 2015.8 to 2016.3 #34376
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is required so that salt-cloud sees a dictionary list of lxc containers that exist so that they do not attempt to recreate the container. The downside to this is that if the container is stopped, it is not started. Fixes saltstack#33633
return list of nodes for lxc driver when called directly
* Add test to match against custom grains * Lint * Forgot to add custom grain
Conflicts: - salt/cloud/clouds/lxc.py
[2015.8] Merge forward from 2015.5 to 2015.8
No conflicts.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No conflicts.