[Submodule] Update sonic-utilities pointer#12760
Merged
prgeor merged 2 commits intosonic-net:masterfrom Nov 21, 2022
Merged
Conversation
Collaborator
|
commit list does not look correct |
Contributor
Author
|
prgeor
approved these changes
Nov 21, 2022
StormLiangMS
pushed a commit
to StormLiangMS/sonic-buildimage
that referenced
this pull request
Dec 8, 2022
* [Submodule] update sonic-utilities submodule
StormLiangMS
pushed a commit
that referenced
this pull request
Dec 10, 2022
* [Submodule] update sonic-utilities submodule
yaqiangz
pushed a commit
to yaqiangz/sonic-buildimage
that referenced
this pull request
Feb 14, 2023
Resolved merge conflicts in the following files manually device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/buffers_defaults_t0.j2 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/buffers_defaults_t1.j2 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2 src/sonic-config-engine/tests/test_j2files.py Related work items: sonic-net#11864, sonic-net#12585, sonic-net#12607, sonic-net#12619, sonic-net#12626, sonic-net#12707, sonic-net#12714, sonic-net#12729, sonic-net#12733, sonic-net#12736, sonic-net#12750, sonic-net#12751, sonic-net#12755, sonic-net#12757, sonic-net#12758, sonic-net#12760, sonic-net#12761, sonic-net#12769, sonic-net#12783
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
3 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.
Commit list:
94a092d (HEAD, origin/master, origin/HEAD) [DPB] Remove the optimization logic for delete/add ports. (#2463)
a588428 Show tech save file to skip non-file entries in cisco-8000 platform (#2507)
25acda3 Fixed SONIC_CLI_IFACE_MODE=alias show ip|ipv6 route output in default mode issue (#2422)
2331e38 avoid printing error if no neighbors are present (#2502)
c497c84 [azure-pipelines] update azp from buster to bullseye (#2455)
611d8c6 Add "f" option for executing reboot force mode (#2482)
a5eb26b [show][muxcable] Catch port Value error exception (#2076) (#2486)
97a340b bugfix[2024] vnet route check exit code fix. (#2480)
d1ca2cd [armhf][sonic-installer] Fix the issue of sonic-installer list after set-default and cleanup (#2479)
Why I did it
update sonic-utilities submodule
How to verify it