[code sync] Merge code from sonic-net/sonic-buildimage:202411 to 202412#602
Merged
mssonicbld merged 5 commits intoAzure:202412from Feb 11, 2025
Merged
Conversation
Collaborator
mssonicbld
commented
Feb 11, 2025
mssonicbld
commented
…omatically (#21665) #### Why I did it src/sonic-swss-common ``` * 8f47a37 - (HEAD -> 202411, origin/202411) Handle 'bulkget' in consumer_table_pops.lua (Azure#970) (25 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
…utomatically (#21659) #### Why I did it src/sonic-host-services ``` * 051218a - (HEAD -> 202411, origin/202411) Fix the issue of no info log in syslog for caclmgrd (Azure#214) (25 hours ago) [mssonicbld] * a433aff - [hostcfgd] Fix the state machine during eth0 default route check failure (Azure#213) (28 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
…atically (#21663) #### Why I did it src/sonic-utilities ``` * 04b60e22 - (HEAD -> 202411, origin/202411) Fix call for spanning-tree commands in dump script (#3752) (28 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it Add missing field introduced from PR: sonic-net/sonic-buildimage#21395 ##### Work item tracking - Microsoft ADO **(number only)**: 31313829 #### How I did it Add the missing field #### How to verify it UT in sample_config_db.json Also test in specific DUT after merge this change. before: ``` sonic_yang(3):All Keys are not parsed in PORT_QOS_MAP dict_keys(['Ethernet16']) sonic_yang(3):exceptionList:["'tc_to_dscp_map'"] ``` after: ``` sonic_yang(6):Note: Below table(s) have no YANG models: bgpraw ``` <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 - [ ] 202305 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
r12f
added a commit
that referenced
this pull request
Mar 28, 2025
…test HEAD automatically (#953) #### Why I did it src/sonic-platform-daemons ``` * 30e63a6 - (HEAD -> 202412, origin/202412) Merge pull request #12 from mihirpat1/wait_maxduration_txturnoff_202412 (8 hours ago) [Prince George] * 6fb2374 - [xcvrd] Add wait based on MaxDurationDPTxTurnOff after disabling Tx (#602) (9 hours ago) [mihirpat1] ``` #### How I did it #### How to verify it #### Description for the changelog
prabhataravind
pushed a commit
that referenced
this pull request
Jul 7, 2025
…D automatically (#22171) #### Why I did it src/sonic-platform-daemons ``` * 0b0ea3b - (HEAD -> master, origin/master, origin/HEAD) [xcvrd] Add wait based on MaxDurationDPTxTurnOff after disabling Tx (#602) (11 hours ago) [mihirpat1] * b8a5cd3 - [xcvrd] DPB support on platforms with CmisManagerTask enabled (#500) (24 hours ago) [Wataru Ishida] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
to mssonicbld/sonic-buildimage-msft
that referenced
this pull request
Sep 27, 2025
… automatically (#24119) #### Why I did it src/sonic-platform-common ``` * 2c5fd51 - (HEAD -> 202505, origin/202505) [Smartswitch] Restart sensord with lock (Azure#602) (3 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
prabhataravind
pushed a commit
that referenced
this pull request
Oct 29, 2025
…est HEAD automatically (#1747) #### Why I did it src/sonic-platform-common ``` * 7f01aea - (HEAD -> 202506, origin/202506) Merge pull request #109 from mssonicbld/sonicbld/202506-merge (4 weeks ago) [mssonicbld] * f765100 - Merge branch '202505' of https://github.com/sonic-net/sonic-platform-common into 202506 (4 weeks ago) [Sonic Automation] * 2c5fd51 - [Smartswitch] Restart sensord with lock (#602) (4 weeks ago) [mssonicbld] ``` #### 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
1 participant
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.