Fix show_diff already set on .my.cnf #743
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Example error message here: https://travis-ci.org/michaeltchapman/puppet-galera/jobs/74083040 |
show_diff is set twice on .my.cnf causing compilation error: Parameter 'show_diff' is already set on File[/.my.cnf] This patch removes one of them
michaeltchapman
force-pushed
the
showdiff
branch
from
31f3f23 to
0dffab2
Compare
|
This looks fine to me, thought I don't understand how it ever worked... |
igalic
added a commit
that referenced
this pull request
Aug 5, 2015
Fix show_diff already set on .my.cnf
|
thank you @michaeltchapman! |
|
@nibalizer classic case of a botched merge and there is no test covering |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
show_diff is set twice on .my.cnf causing compilation error:
Parameter 'show_diff' is already set on File[/.my.cnf]
This patch removes one of them