Merge 2015.5 into 2015.8 #30529
Merged
Merge 2015.5 into 2015.8 #30529
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 will allow 2015.5 releases to operate successfully on Fedora 22 and newer.
Backport DNF support to 2015.5 branch
This commit adds 2015.8-specific context to the top-level docstring and also removes yum-specific terminology from the pkg.remove function.
terminalmage
added a commit
to terminalmage/salt
that referenced
this pull request
Jan 22, 2016
In the process of resolving merge conflicts in the merge-forward of 2015.5 to 2015.8 which I did in saltstack#30529, I found two changes that should have been made in the 2015.5 branch. One was the removal of yum-specific information in the pkg.remove docstring, and the other was needless use of -q when deleting a version lock in pkg.unhold. We're not parsing the output and the default loglevel is debug, so using -q here removes helpful troubleshooting output from the log.
|
@terminalmage The linter isn't quite happy here. |
cachedout
added
the
pending-changes
terminalmage
force-pushed
the
2015.5-2015.8
branch
from
7a57301
to
e85ad69
Compare
|
Linter should be happy now. |
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.
This merge-forward brings the work done in #30484 to the 2015.8 branch, and resolves the associated merge conflicts.