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 file.append logic #30282

Merged
merged 3 commits into from Jan 12, 2016

Conversation

Projects
None yet
1 participant
@cachedout
Contributor

cachedout commented Jan 11, 2016

The logic in #30156 was slightly incorrect. This properly nests the conditionals. Fixes test for: integration.states.file.FileTest.test_issue_2379_file_append

cachedout added some commits Jan 11, 2016

Fix logic error in file.append
The conditional in #31056 was incorrectly written. This properly nests the check for the ignore_whitespace flag.

cachedout added a commit that referenced this pull request Jan 12, 2016

@cachedout cachedout merged commit 8438d19 into saltstack:2015.8 Jan 12, 2016

2 of 5 checks passed

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