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

Merged
merged 7 commits into from Jan 25, 2016

Conversation

Projects
None yet
5 participants
@terminalmage
Member

terminalmage commented Jan 24, 2016

This fixes a bug found thanks to test breakage, which was introduced by my
recent backporting of DNF support into 2015.5.

terminalmage and others added some commits Jan 22, 2016

2015.5 tweaks from #30529
In the process of resolving merge conflicts in the merge-forward of
2015.5 to 2015.8 which I did in #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.
Added placeholder release notes for 2015.5.10
Changed old doc links from docs.saltstack.org to docs.saltstack.com
Merge pull request #30548 from jacobhammons/doc-fixes
Added placeholder release notes for 2015.5.10
Merge pull request #30582 from terminalmage/dnf-repoquery-multiple-ta…
…rgets

yumpkg.check_db: run separate repoquery commands when multiple names passed
@terminalmage

This comment has been minimized.

Show comment
Hide comment
@terminalmage

terminalmage Jan 25, 2016

Member

The broken pkg tests are now passing.

Member

terminalmage commented Jan 25, 2016

The broken pkg tests are now passing.

rallytime added a commit that referenced this pull request Jan 25, 2016

@rallytime rallytime merged commit a7ba2df into saltstack:2015.8 Jan 25, 2016

5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #13002 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #12690 — SUCCESS
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #11663 — SUCCESS
Details
jenkins/salt-pr-rs-ubuntu14.04-n Salt PR - RS Ubuntu 14 #9072 — SUCCESS
Details

@terminalmage terminalmage deleted the terminalmage:2015.5-2015.8 branch Feb 3, 2016

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