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

Back-port #30185 to 2015.8 #30189

Merged
merged 6 commits into from Jan 7, 2016

Conversation

Projects
None yet
5 participants
@rallytime
Contributor

rallytime commented Jan 6, 2016

Back-port #30185 to 2015.8

@thatch45 and @cachedout Please review to make sure I managed the merge conflicts correctly.

Refs #30118

@rallytime rallytime referenced this pull request Jan 6, 2016

Merged

State mock #30118

basepi added a commit that referenced this pull request Jan 7, 2016

@basepi basepi merged commit ad7522c into saltstack:2015.8 Jan 7, 2016

2 of 5 checks passed

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

@rallytime rallytime deleted the rallytime:bp-30185 branch Jan 7, 2016

@jfindlay jfindlay added Release Notes and removed Release Notes labels Jan 8, 2016

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