[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#51
Merged
mssonicbld merged 9 commits intoAzure:202205from Jul 1, 2023
Merged
Conversation
Collaborator
mssonicbld
commented
Jul 1, 2023
mssonicbld
commented
…omatically (#15655) src/sonic-swss-common * 8a53f04 - (HEAD -> 202205, origin/202205) Fix pipeline issue caused by urllib3 v2 (9 hours ago) [Liu Shilong] * 3a1032f - [Ci] Fix collect log error in azp template (Azure#799) (35 hours ago) [xumia]
… contain front panel ports (#14814) (#15669) * [chassis][lldp] Fix the lldp error log in host instance which doesn't contain front pannel ports --------- Signed-off-by: mlok <[email protected]> Co-authored-by: Marty Y. Lok <[email protected]>
* [Arista] Update hwsku.json for Arista-7050QX-32S-S4Q31 * Change to 3x10G(3)+1x1G(1) on Arista-7050QX-32S-S4Q31 Co-authored-by: byu343 <[email protected]>
#### Why I did it ISSU version check fails due to inability to mount squashfs from 202211 on 201911 #### How I did it Put ISSU version file under platform directory #### How to verify it Warm-upgrade matrix: - 201911 (with sonic-net/sonic-buildimage#14928) to master - 201911 (with sonic-net/sonic-buildimage#14928) to 202211 - 202012 (with sonic-net/sonic-buildimage#14927) to master - 202205 (with this change cherry-picked) to master Co-authored-by: Stepan Blyshchak <[email protected]>
…tically (#15678) src/sonic-sairedis * 82a132f - (HEAD -> 202205, origin/202205) [warmboot] Add workaround for `INIT_VIEW` failure (Azure#1252) (6 hours ago) [Jing Zhang] * c901fa8 - [202205] Use SAI_STATUS_ITEM_NOT_FOUND when key not found (Azure#1237) (20 hours ago) [Lawrence Lee]
…atically (#15680) src/sonic-utilities * 517ba4d4 - (HEAD -> 202205, origin/202205) [chassis][multi asic] change acl_loader to use tcp socket for db communication (#2525) (6 hours ago) [Arvindsrinivasan Lakshmi Narasimhan]
How I did it Free up Multiprocessing Manager resource at task stop request [self.mpmgr.shutdown() in task_stop] How to verify it time systemctl stop system-health.service
jon-nokia
pushed a commit
to jon-nokia/sonic-buildimage-msft
that referenced
this pull request
May 3, 2024
…ly (#16876) #### Why I did it src/sonic-ztp ``` * 739470d - (HEAD -> master, origin/master, origin/HEAD) [ZTP] 'config reload' use -f to avoid system checks (Azure#52) (4 hours ago) [Peter Yu] * 04cd8e8 - [ZTP] bufsize=1 not supported in binary mode (Azure#51) (4 hours ago) [Peter Yu] ``` #### How I did it #### How to verify it #### Description for the changelog
r12f
pushed a commit
that referenced
this pull request
Jan 18, 2025
…ly (#21340) #### Why I did it src/dhcprelay ``` * 13d7f5a - (HEAD -> 202411, origin/202411) Add wait and check ip address check when dhcp6relay init (#52) (#66) (25 hours ago) [mssonicbld] * 1e7b13a - [202411] Clear counter when dhcp6relay init (#51) (#65) (4 days ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
that referenced
this pull request
Apr 29, 2025
…D automatically (#1064) #### Why I did it src/sonic-sairedis ``` * 0209ab8 - (HEAD -> 202412, origin/HEAD, origin/202412) [FlexCounter] add support for SRv6 MySID counters (#50) (21 hours ago) [mssonicbld] * aceb9ed - Move time stamp to time stamp table in counter database to avoid frequently update the counter table (#51) (21 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
prabhataravind
pushed a commit
that referenced
this pull request
Jul 7, 2025
…ly (#21159) #### Why I did it src/dhcprelay ``` * 2a2fb68 - (HEAD -> master, origin/master, origin/HEAD) Clear counter when dhcp6relay init (#51) (2 hours ago) [Yaqiang Zhu] ``` #### How I did it #### How to verify it #### Description for the changelog
prabhataravind
pushed a commit
that referenced
this pull request
Jul 7, 2025
…ly (#22145) #### Why I did it src/sonic-stp ``` * 9949755 - (HEAD -> master, origin/master, origin/HEAD) MSTP PTX/PRX state machine APIs (#53) (18 hours ago) [Divya Kumaran Chandralekha] * 12cb28f - Mstp feature - State machine APIs (#51) (23 hours ago) [Divya Kumaran Chandralekha] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
that referenced
this pull request
Jul 8, 2025
…D automatically (#1323) #### Why I did it src/sonic-sairedis ``` * c4d152d4 - (HEAD -> 202503, origin/202503) Merge pull request #59 from mssonicbld/sonicbld/202503-merge (23 hours ago) [mssonicbld] * 8f50be71 - Merge branch '202412' of https://github.com/Azure/sonic-sairedis.msft into 202503 (23 hours ago) [Sonic Automation] * b36d5641 - (origin/HEAD, origin/202412, 202412) [trim]: Add Packet Trimming Asym DSCP to VS lib (#68) (4 days ago) [mssonicbld] * 6e75cc6c - [TAM]: Add default SAI_TAM_ATTR_TELEMETRY_OBJECTS_LIST of TAM for saivs create operation (#1614) (#66) (8 days ago) [Ze Gan] * 0ae8494d - [unittest ]Conditionally enable TestServerSaiMockChannel (#67) (8 days ago) [mssonicbld] * 12b21f3b - [syncd] Check whether stat_st and tam_telemetry is defined (#1590) (#65) (13 days ago) [Ze Gan] * 701a114b - [TAM]: Fix TAM notification and vslib implementation (#1606) (#62) (13 days ago) [Ze Gan] * 6b97f74e - [SAI]: Update SAI to support QUERY_STATS_ST_CAPABILITY and TAM (#1573) (#63) (13 days ago) [Ze Gan] * f21e12ce - [trim]: Add Packet Trimming Port/Queue stats to VS lib (#60) (4 weeks ago) [Nazarii Hnydyn] * 9d396448 - Merge pull request #61 from mssonicbld/cherry/msft-202412/1548 (4 weeks ago) [Ze Gan] |\ | failure_prs.log 613654bb - [syncd] Move log set function after api initialize (4 weeks ago) [Sonic Build Admin] |/ * e18530c8 - Update SAI version to 1.16.1 (#54) (8 weeks ago) [mramezani95] * 3c33c26e - Update codeql runs-on ubuntu version to 22.04 (#56) (8 weeks ago) [mssonicbld] * 87d6f464 - [trim]: Add Packet Trimming to VS lib (#55) (9 weeks ago) [mssonicbld] * 80c43090 - Support auto negotiation on the VS platform to avoid error messages. (#52) (10 weeks ago) [mssonicbld] * 0209ab89 - [FlexCounter] add support for SRv6 MySID counters (#50) (2 months ago) [mssonicbld] * aceb9ed1 - Move time stamp to time stamp table in counter database to avoid frequently update the counter table (#51) (2 months ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
r12f
pushed a commit
that referenced
this pull request
Aug 2, 2025
… HEAD automatically (#1439) #### Why I did it src/sonic-linux-kernel ``` * 9f5eafd - (HEAD -> 202412, origin/HEAD, origin/202412) Ignore table if the EFI memory attributes are corrupt (#51) (62 minutes ago) [mssonicbld] * c47cdc3 - Merge pull request #50 from mssonicbld/sonicbld/202412-merge (4 hours ago) [mssonicbld] * a1957f1 - Merge branch '202411' of https://github.com/sonic-net/sonic-linux-kernel into 202412 (4 hours ago) [Sonic Automation] * 84db3a0 - Fix slave container used for 202411 branch (#504) (15 hours ago) [Saikrishna Arcot] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
that referenced
this pull request
Aug 3, 2025
… HEAD automatically (#1452) #### Why I did it src/sonic-linux-kernel ``` * f60c881 - (HEAD -> 202503, origin/202503) Merge pull request #52 from mssonicbld/sonicbld/202503-merge (23 hours ago) [mssonicbld] * 5c68aac - Merge branch '202412' of https://github.com/Azure/sonic-linux-kernel.msft into 202503 (23 hours ago) [Sonic Automation] * 9f5eafd - (origin/HEAD, origin/202412, 202412) Ignore table if the EFI memory attributes are corrupt (#51) (2 days ago) [mssonicbld] * c47cdc3 - Merge pull request #50 from mssonicbld/sonicbld/202412-merge (2 days ago) [mssonicbld] * a1957f1 - Merge branch '202411' of https://github.com/sonic-net/sonic-linux-kernel into 202412 (2 days ago) [Sonic Automation] * 84db3a0 - Fix slave container used for 202411 branch (#504) (2 days ago) [Saikrishna Arcot] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
that referenced
this pull request
Sep 13, 2025
…test HEAD automatically (#1606) #### Why I did it src/sonic-platform-daemons ``` * c1e0393 - (HEAD -> 202506, origin/202506) Merge pull request #51 from mssonicbld/sonicbld/202506-merge (4 hours ago) [mssonicbld] * 02ec360 - Merge branch '202505' of https://github.com/sonic-net/sonic-platform-daemons into 202506 (4 hours ago) [Sonic Automation] * c0b9ec6 - Handle restore_count and system_enable ”NoneType“ value scenario. (#680) (12 hours ago) [ryanzhu706] ``` #### How I did it #### How to verify it #### Description for the changelog
bingwang-ms
pushed a commit
that referenced
this pull request
Jan 16, 2026
… (#24046) #### Why I did it src/dhcpmon ``` * 1ceb36d - (HEAD -> master, origin/master, origin/HEAD) [DHCPmon]Suppot checksum validation for in dhcpmon (#51) (6 days ago) [Yanpeng Zhang] ``` #### How I did it #### How to verify it #### Description for the changelog
liushilongbuaa
pushed a commit
that referenced
this pull request
Mar 25, 2026
…tically (#24673) #### Why I did it src/sonic-dash-api ``` * d24638b - (HEAD -> master, origin/master, origin/HEAD) Modify dependencies to fix broken parallel build (#51) (33 hours ago) [Hemanth Kumar Tirupati] ``` #### How I did it #### How to verify it #### Description for the changelog
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
2 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.