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

Apply PR #31031 to 2015.8.4.follow_up #31092

Merged
merged 3 commits into from Feb 10, 2016

Conversation

Projects
None yet
3 participants
@terminalmage
Member

terminalmage commented Feb 10, 2016

No description provided.

gtmanfred and others added some commits Feb 8, 2016

Don't handle epoch specially for dnf
Epoch handling is done in salt.utils.pkg.rpm.parse_pkginfo() now, so
remove special handling for dnf and make both yum and dnf work the same.
@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Feb 10, 2016

Contributor

Go Go Jenkins!

Contributor

cachedout commented Feb 10, 2016

Go Go Jenkins!

@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Feb 10, 2016

Contributor

I linted both of these on my own machine and they look fine.

Contributor

cachedout commented Feb 10, 2016

I linted both of these on my own machine and they look fine.

cachedout added a commit that referenced this pull request Feb 10, 2016

@cachedout cachedout merged commit 5a6a93e into saltstack:2015.8.4.follow_up Feb 10, 2016

2 of 5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #13297 — FAILURE
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #12310 — FAILURE
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #13615 — SUCCESS
Details
jenkins/salt-pr-rs-ubuntu14.04-n Salt PR - RS Ubuntu 14 #9679 — SUCCESS
Details

@terminalmage terminalmage deleted the terminalmage:issue31014-2015.8.4.follow_up branch Apr 6, 2016

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