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

[2015.8] Merge forward from 2015.5 to 2015.8 #30373

Merged
merged 16 commits into from Jan 15, 2016

Conversation

Projects
None yet
7 participants
@basepi
Collaborator

basepi commented Jan 14, 2016

[2015.8] Merge forward from 2015.5 to 2015.8

Conflicts:
    salt/cloud/clouds/linode.py
    salt/states/rabbitmq_policy.py

robgott and others added some commits Jan 6, 2016

Merge pull request #30207 from rallytime/rabbitmq_states_doc_fix
Use correct spacing in rabbitmq state examples
Merge pull request #30237 from jacobhammons/man-pages-prev
Updated man pages, copyright year, and doc version for 2015.5.9
Merge pull request #30248 from jfindlay/2015.5
add 2015.5.9 release notes
Merge pull request #30291 from thegoodduke/for_fix_ipset
ipset: fix test=true & add comment for every entry
Merge pull request #30364 from rallytime/fix-30341
Add TLS version imports and add linode driver documentation notices
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    salt/cloud/clouds/linode.py
    salt/states/rabbitmq_policy.py
@basepi

This comment has been minimized.

Show comment
Hide comment
@basepi

basepi Jan 15, 2016

Collaborator

Failures unrelated.

Collaborator

basepi commented Jan 15, 2016

Failures unrelated.

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

Merge pull request #30373 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8

@basepi basepi merged commit 4cc9422 into saltstack:2015.8 Jan 15, 2016

2 of 5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #11343 — FAILURE
Details
jenkins/salt-pr-rs-ubuntu14.04-n Salt PR - RS Ubuntu 14 #8831 — FAILURE
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #12753 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #12449 — SUCCESS
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment