Skip to content
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

Backport #26938 #27030

Merged
merged 3 commits into from Sep 11, 2015

Conversation

Projects
None yet
3 participants
@jfindlay
Copy link
Contributor

commented Sep 10, 2015

Backport #26938. Also resolve merge conflict with #27004.

@jfindlay jfindlay force-pushed the jfindlay:winreg branch from f2c220a to 120fbe7 Sep 10, 2015

rallytime added a commit that referenced this pull request Sep 11, 2015

@rallytime rallytime merged commit e23caa8 into saltstack:2015.5 Sep 11, 2015

5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #9444 — SUCCESS
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #520 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #9165 — SUCCESS
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #7994 — SUCCESS
Details

@jfindlay jfindlay deleted the jfindlay:winreg branch Sep 14, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.