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

Merged
merged 5 commits into from Dec 15, 2015

Conversation

Projects
None yet
4 participants
@basepi
Collaborator

basepi commented Dec 14, 2015

[2015.8] Merge forward from 2015.5 to 2015.8

No conflicts

jfindlay and others added some commits Dec 8, 2015

Merge pull request #29527 from jfindlay/2015.5
2015.5.7 notes: add note about not being released
Default value should be False and not 'False'
If default is a string, then "if x" statements will be True, not False.
Merge pull request #29673 from rallytime/fix-29661
Default value should be False and not 'False'

cachedout added a commit that referenced this pull request Dec 15, 2015

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

@cachedout cachedout merged commit 30499e4 into saltstack:2015.8 Dec 15, 2015

2 of 5 checks passed

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