bugfix: fix merge flag default value in config #1246
Merged
Conversation
This file contains 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
if flag not be passed, we should not merge it with demon config file, the bug only exist in slice and array type of flag, since we do not do conflict check to this type of flag. Signed-off-by: Ace-Tang <aceapril@126.com>
Codecov Report
@@ Coverage Diff @@
## master #1246 +/- ##
==========================================
- Coverage 15.31% 15.28% -0.03%
==========================================
Files 172 172
Lines 10665 10681 +16
==========================================
Hits 1633 1633
- Misses 8912 8928 +16
Partials 120 120
|
|
LGTM |
pouchrobot
added
the
LGTM
This was referenced May 3, 2018
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.
if flag not be passed, we should not merge it with demon config
file, the bug only exist in slice and array type of flag, since
we do not do conflict check to this type of flag.
Signed-off-by: Ace-Tang aceapril@126.com
Ⅰ. Describe what this PR did
Ⅱ. Does this pull request fix one issue?
Ⅲ. Describe how you did it
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews