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 #30529

Merged
merged 8 commits into from Jan 22, 2016

Conversation

Projects
None yet
3 participants
@terminalmage
Member

terminalmage commented Jan 22, 2016

This merge-forward brings the work done in #30484 to the 2015.8 branch, and resolves the associated merge conflicts.

terminalmage and others added some commits Jan 20, 2016

Backport DNF support to 2015.5 branch
This will allow 2015.5 releases to operate successfully on Fedora 22 and
newer.
Merge pull request #30484 from terminalmage/dnf-yumpkg-2015.5
Backport DNF support to 2015.5 branch
Docstring tweaks
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

2015.5 tweaks from saltstack#30529
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.

cachedout added a commit that referenced this pull request Jan 22, 2016

@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Jan 22, 2016

Contributor

@terminalmage The linter isn't quite happy here.

Contributor

cachedout commented Jan 22, 2016

@terminalmage The linter isn't quite happy here.

@terminalmage

This comment has been minimized.

Show comment
Hide comment
@terminalmage

terminalmage Jan 22, 2016

Member

Linter should be happy now.

Member

terminalmage commented Jan 22, 2016

Linter should be happy now.

cachedout added a commit that referenced this pull request Jan 22, 2016

@cachedout cachedout merged commit 1da1bb9 into saltstack:2015.8 Jan 22, 2016

2 of 5 checks passed

jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #11593 — FAILURE
Details
default Merged build started.
Details
jenkins/salt-pr-rs-ubuntu14.04-n Salt PR - RS Ubuntu 14 #9029 — RUNNING
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #12959 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #12647 — SUCCESS
Details

@terminalmage terminalmage deleted the terminalmage:2015.5-2015.8 branch Jan 22, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment