Fix merge conflict error in test_ipv6_bgp_scale.py#23118
Merged
StormLiangMS merged 1 commit intosonic-net:masterfrom Mar 19, 2026
Merged
Fix merge conflict error in test_ipv6_bgp_scale.py#23118StormLiangMS merged 1 commit intosonic-net:masterfrom
StormLiangMS merged 1 commit intosonic-net:masterfrom
Conversation
Fix issue during conflict resolution when merging PR sonic-net#22419 and PR sonic-net#22549 Change-Id: I4b2991bab1cb94e94c387de323d257f9834de63a Signed-off-by: weiguo-nvidia <[email protected]>
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
|
Hi @weiguo-nvidia, do you need a backport to the 202511 branch for this fix as well? |
Contributor
Author
Hi @wsycqyz , Yes, 202511 branch also need this fix |
yxieca
approved these changes
Mar 19, 2026
Collaborator
yxieca
left a comment
yxieca
left a comment
There was a problem hiding this comment.
AI agent on behalf of Ying. Reviewed; no issues found.
Collaborator
Code Review✅ LGTM — Correct fix for a merge conflict artifact. The incorrectly introduced |
StormLiangMS
added
Request for 202511 branch
mssonicbld
pushed a commit
to mssonicbld/sonic-mgmt
that referenced
this pull request
Mar 19, 2026
Fix issue during conflict resolution when merging PR sonic-net#22419 and PR sonic-net#22549 Change-Id: I4b2991bab1cb94e94c387de323d257f9834de63a Signed-off-by: weiguo-nvidia <[email protected]> Signed-off-by: mssonicbld <[email protected]>
Collaborator
|
Cherry-pick PR to 202511: #23141 |
12 tasks
mssonicbld
pushed a commit
that referenced
this pull request
Mar 19, 2026
Fix issue during conflict resolution when merging PR #22419 and PR #22549 Change-Id: I4b2991bab1cb94e94c387de323d257f9834de63a Signed-off-by: weiguo-nvidia <[email protected]> Signed-off-by: mssonicbld <[email protected]>
mssonicbld
added
Included in 202511 branch
and removed
Created PR to 202511 branch
labels
vrajeshe
pushed a commit
to vrajeshe/sonic-mgmt
that referenced
this pull request
Mar 23, 2026
Fix issue during conflict resolution when merging PR sonic-net#22419 and PR sonic-net#22549 Change-Id: I4b2991bab1cb94e94c387de323d257f9834de63a Signed-off-by: weiguo-nvidia <[email protected]> Signed-off-by: Venkata Gouri Rajesh Etla <[email protected]>
ravaliyel
pushed a commit
to ravaliyel/sonic-mgmt
that referenced
this pull request
Mar 27, 2026
Fix issue during conflict resolution when merging PR sonic-net#22419 and PR sonic-net#22549 Change-Id: I4b2991bab1cb94e94c387de323d257f9834de63a Signed-off-by: weiguo-nvidia <[email protected]>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Summary: Fix issue during conflict resolution when merging PR #22419 and PR #22549
Fixes #
PR #22676 incorrect change
icmp_typetoglobal_icmp_type. Change it backType of change
Back port request
Approach
What is the motivation for this PR?
How did you do it?
How did you verify/test it?
Any platform specific information?
Supported testbed topology if it's a new test case?
Documentation