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

Fix documentation for pillar_merge_lists which default is False, not … #30609

Merged
merged 1 commit into from Jan 25, 2016

Conversation

Projects
None yet
2 participants
@seanjnkns
Contributor

seanjnkns commented Jan 25, 2016

Fix documentation for pillar_merge_lists which default is False, not True. From PR #30062. Backport from develop.

@rallytime

This comment has been minimized.

Show comment
Hide comment
@rallytime

rallytime Jan 25, 2016

Contributor

Thanks @seanjnkns!

Contributor

rallytime commented Jan 25, 2016

Thanks @seanjnkns!

rallytime added a commit that referenced this pull request Jan 25, 2016

Merge pull request #30609 from seanjnkns/backport_30602
Fix documentation for pillar_merge_lists which default is False, not …

@rallytime rallytime merged commit 89b4f3d into saltstack:2015.8 Jan 25, 2016

2 of 5 checks passed

default Merged build started.
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #11681 — RUNNING
Details
jenkins/salt-pr-rs-ubuntu14.04-n Salt PR - RS Ubuntu 14 #9089 — RUNNING
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #13019 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #12707 — SUCCESS
Details

@seanjnkns seanjnkns deleted the seanjnkns:backport_30602 branch Mar 3, 2016

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