[Config] Add handling for ignored keys in ArrayNode::mergeValues. #33124
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
|
Code styling issues were not fixed to minimize impact. |
nicolas-grekas
approved these changes
Aug 13, 2019
|
tried these changes as I was hitting the same issue and it works with them, can't wait for this PR to go live |
|
Thank you @alex-dev. |
nicolas-grekas
added a commit
that referenced
this pull request
Aug 20, 2019
…Values. (Alexandre Parent) This PR was squashed before being merged into the 4.3 branch (closes #33124). Discussion ---------- [Config] Add handling for ignored keys in ArrayNode::mergeValues. | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #33101 | License | MIT | Doc PR | N/A Fix case where normalized data accepting and keeping ignored keys is rejected during merge. Commits ------- 311e1c4 [Config] Add handling for ignored keys in ArrayNode::mergeValues.
Merged
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.
Fix case where normalized data accepting and keeping ignored keys is rejected during merge.