[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#98
Merged
mssonicbld merged 2 commits intoAzure:202205from Sep 5, 2023
Merged
Conversation
Collaborator
mssonicbld
commented
Sep 5, 2023
mssonicbld
commented
…ce (#15624) There is a redundant line in init_cfg.json.j2. It would cause pmon service always has "has_timer=False". However, we know that PMON has a timer now. So, I try to fix it here.
mssonicbld
added a commit
that referenced
this pull request
Jun 15, 2025
…tomatically (#1245) #### Why I did it src/sonic-swss ``` * dbd9546 - (HEAD -> 202503, origin/202503) Merge pull request #98 from mssonicbld/sonicbld/202503-merge (20 hours ago) [mssonicbld] * 39edf42 - Merge branch '202412' of https://github.com/Azure/sonic-swss.msft into 202503 (23 hours ago) [Sonic Automation] * 8bd296d - (origin/202412) Revert "Set Port UPDATE_DSCP attribute when TC_TO_DSCP map is attache… (#96) (2 days ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
that referenced
this pull request
Jun 27, 2025
…est HEAD automatically (#1296) #### Why I did it src/sonic-platform-common ``` * 6f812ba - (HEAD -> 202503, origin/202503) [cmis] Add delay during CDB firmware download to remove I2C errors (#99) (8 hours ago) [mssonicbld] * 24abc8c - Merge pull request #98 from mssonicbld/sonicbld/202503-merge (23 hours ago) [mssonicbld] * 2894c45 - Merge branch '202412' of https://github.com/Azure/sonic-platform-common.msft into 202503 (23 hours ago) [Sonic Automation] * 01b23d9 - (origin/202412) Merge pull request #96 from mssonicbld/sonicbld/202412-merge (2 days ago) [mssonicbld] * 081e7ff - Merge branch '202411' of https://github.com/sonic-net/sonic-platform-common into 202412 (2 days ago) [Sonic Automation] * 1adc1dc - [build] Update Azure pipeline to use Ubuntu 24.04 image (#581) (3 days ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
Pterosaur
pushed a commit
that referenced
this pull request
Sep 17, 2025
…tomatically (#1610) #### Why I did it src/sonic-gnmi ``` * 0222d5f - (HEAD -> 202412, origin/202412) Merge pull request #101 from Azure/202412-dev (2 hours ago) [Zain Budhwani] * ec20f64 - (origin/202412-dev) Support Show Interface tranceiver lpmode (#92) (17 hours ago) [yiliu4] * c9b5498 - "Make interface as arg instead of option for `show interface alias` and `show interface flap` (#100) (24 hours ago) [axin] * e9f0e29 - Add show interfaces portchannel /ecn (#77) (27 hours ago) [jiayuj2021] * 126f6fe - Add implementation for 'show ipv6 prefix-list' (#84) (34 hours ago) [nanali-msft] * 9977ae6 - Remove non-common functions from show_common.go (#98) (34 hours ago) [gnemuw] * d76043c - Add option SONIC_CLI_IFACE_MODE to support naming mode environment variable refresh in gnmi (#88) (2 days ago) [axin] * 37692e9 - Replacing the `queue-type` option with subcommands for `show queue watermark` (#89) (2 days ago) [mramezani95] * 3f4bd4b - Fix srv6 stats (#95) (2 days ago) [Changrong Wu] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
that referenced
this pull request
Nov 19, 2025
…D automatically (#1818) #### Why I did it src/sonic-sairedis ``` * 1428cdf6 - (HEAD -> 202412, origin/HEAD, origin/202412) Merge pull request #98 from mssonicbld/sonicbld/202412-merge (23 hours ago) [mssonicbld] * c6805d2e - Merge branch '202411' of https://github.com/sonic-net/sonic-sairedis into 202412 (23 hours ago) [Sonic Automation] * 45bf5582 - migrate agent pool from sonicbld-arm64 to sonicso1ES-arm64, and sonicbld-armhf to sonicso1ES-armhf for branch 202411 (#1692) (2 days ago) [yijingyan2] ``` #### 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
…er-dependency (#23716) #### Why I did it sonic-swss-common ``` dc05565 2025-08-14 | Revert "[strict yang] Add YANG based cfg_schema.h to schema.h (#1008)" (#1067) [jingwenxie] e782b12 2025-08-12 | Add c-api/Rust wrappers for ConfigDBConnector and EventPublisher (#1062) [Qi Luo] 1484a85 2025-08-08 | Ignore nonexistent include in database_global.json (#1041) [yue-fred-gao] 839ddf0 2025-08-08 | [strict yang] Add YANG based cfg_schema.h to schema.h (#1008) [jingwenxie] ``` sonic-dash-ha ``` 6163990 2025-08-12 | Update sonic_db_config_initialize_global with extra argument (#98) [yue-fred-gao] 01a88ef 2025-08-07 | Suppress update from consumer bridge if there is no change (#89) [yue-fred-gao] ```
bingwang-ms
pushed a commit
that referenced
this pull request
Jan 16, 2026
…e latest HEAD automatically (#23931) #### Why I did it src/wpasupplicant/sonic-wpa-supplicant ``` * 31c1c8db1 - (HEAD -> master, origin/master, origin/HEAD) Changes in HOSTAPD to Support PAC (#90) (67 minutes ago) [Vijaya Kumar Abbaraju] * ed735fe67 - [CodeQL]: Failed CI on CodeQL (#98) (2 hours ago) [Ze Gan] * d22c2f48e - [action] Fix codeQL github action issue. (#96) (14 hours ago) [Liu Shilong] ``` #### 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.