[2015.8] Merge forward from 2015.5 to 2015.8 #33877
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
…glance glance.warn_until shouldn't be checked for a doc string
The network.get_bufsize function requires an interface for arg. In the example, the argument is missing and the function name is a little bit off. Add arbitrary 'eth0' for argument and correct the name.
…604-1938 Fix minor docstring issues
Using an XZ-compressed archive with archive.extracted raises a tarfile.ReadError exception, as only gzip and bzip2 are supported by tarfile. This commit catches that exception and attempts to extract using xz-utils, if present. It also makes some clarifications and corrections to the documentation.
…d-xz Support extraction of XZ archives in archive.extracted state
This change did not make it into 2015.5.11, and it is not certain at this time whether or not we will do a 2015.5.12.
Support syncing pillar modules to masterless minions
…anged Update versionchanged directive
Conflicts: - salt/modules/saltutil.py - salt/states/archive.py
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.
Conflicts: