[2016.3] Merge forward from 2015.8 to 2016.3 #33637
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
Updated version numbers in the docs for the 2016.3.0 release
Add a section to the jinja docs about escaping jinja
…signature-2015.8 unit tests for rpm.checksum() and zypper.download()
The first time through the loop we deleted the dir and then stack traced the second time through the loop if we hit the other conditional. Resolves saltstack#33544
Fix crashing Maintenence process
Fix win servermanager
Conflicts: - - - - - - - - - doc/conf.py
|
Go Go Jenkins! |
|
Something went sideways on this zypper test. Could you take another look please? |
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: