Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#202

Merged
mssonicbld merged 3 commits intoAzure:202305from
mssonicbld:sonicbld/202305-merge
Dec 29, 2023
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#202
mssonicbld merged 3 commits intoAzure:202305from
mssonicbld:sonicbld/202305-merge

Conversation

@mssonicbld
Copy link
Collaborator

* fb83d4d82 - (head/202305) [Mellanox] wait until hw-management watchdog files ready (#17618) (#17633) (2023-12-29) [mssonicbld]
* a8ad19d4a - [202305] Optimize syslog rate limit feature for fast and warm boot (#17478) (2023-12-28) [Junchao-Mellanox]<br>```

Junchao-Mellanox and others added 3 commits December 28, 2023 20:53
…17478)

Backport PR #17458 due to conflict.

Why I did it
Optimize syslog rate limit feature for fast and warm boot

Work item tracking
Microsoft ADO (number only):
How I did it
Optimize redis start time
Don't render rsyslog.conf in container startup script
Disable containercfgd by default. There is a new CLI to enable it (in another PR)
How to verify it
Manual test
Regression test
@mssonicbld mssonicbld merged commit c7ad994 into Azure:202305 Dec 29, 2023
mssonicbld added a commit to mssonicbld/sonic-buildimage-msft that referenced this pull request Mar 14, 2024
…lly (#18256)

#### Why I did it
src/sonic-gnmi
```
* 71ae185 - (HEAD -> 202305, origin/202305) Merge pull request Azure#202 from sonic-net/revert-191-cherry/202305/190 (82 minutes ago) [StormLiangMS]
|\ 
| failure_prs.log e2b78b4 - (origin/revert-191-cherry/202305/190) Revert "Fix sonic string in osversion/build (Azure#190)" (2 hours ago) [StormLiangMS]
|/ 
* b431273 - Account for GLOBAL key in PFC_WD (Azure#178) (6 days ago) [Zain Budhwani]
* e1af33f - Merge pull request Azure#199 from abdosi/202305 (6 days ago) [StormLiangMS]
|\ 
| failure_prs.log f7e216b - Update db_client.go (6 days ago) [abdosi]
|/ 
* ec3f56d - Fix sonic string in osversion/build (Azure#190) (9 days ago) [Zain Budhwani]
```
#### How I did it
#### How to verify it
#### Description for the changelog
theasianpianist pushed a commit to theasianpianist/sonic-buildimage-msft that referenced this pull request Apr 9, 2024
…y (#15503)

src/linkmgrd

* 9aebd5a - (HEAD -> 202205, origin/202205) Re-handle pre-init mux config notification after state machine init (Azure#202) (10 hours ago) [Longxiang Lyu]
prabhataravind pushed a commit that referenced this pull request Jul 7, 2025
…utomatically (#21565)

#### Why I did it
src/sonic-host-services
```
* 69788c2 - (HEAD -> master, origin/master, origin/HEAD) Fix: Set default values for kdump enhancement (#217) (3 days ago) [Muhammad Ali Hussnain]
* d7e8021 - [chassis] make multi_asic_ns_to_host_fwd False for EXTERNAL_CLIENT acl service (#218) (4 days ago) [Arvindsrinivasan Lakshmi Narasimhan]
* d925457 - Fix sudo command failed because root user password expired by password hardening feature issue (#215) (4 days ago) [Hua Liu]
* 7e1b280 - reverted ssh_key to ssh_string (#216) (6 days ago) [Muhammad Ali Hussnain]
* 741a9df - Handle NotImplementedError in determine-reboot-cause that will be thrown on VS Chassis platform (#211) (7 days ago) [Changrong Wu]
* 47f6feb - check sonic-installer message and return proper error code for when image doesn't exist. (#210) (7 days ago) [Dawei Huang]
* 1fe9a76 - Updated Key and Path (#209) (7 days ago) [Muhammad Ali Hussnain]
* bb0a31c - Adding support for persistent storage and retrieval of DPU reboot-cause (#169) (8 days ago) [rameshraghupathy]
* 5e08927 - [hostcfgd] Fix the state machine during eth0 default route check failure (#196) (2 weeks ago) [Vivek]
* d2cc1a8 - Add ImageService.set_next_boot for GNOI Activate OS. (#207) (3 weeks ago) [Dawei Huang]
* 9c49913 - register image_service and docker_service. (#208) (3 weeks ago) [Dawei Huang]
* d88d8d0 - Implementation for ImageService.List (#206) (4 weeks ago) [Dawei Huang]
* d7e4df5 - Enabled configuring the default number of kdumps in Linux. (#202) (4 weeks ago) [Mridul Bajpai]
* ca9d329 - kdump-remote feature in hostcfgd (#166) (4 weeks ago) [Muhammad Ali Hussnain]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Jul 15, 2025
…AD automatically (#1352)

#### Why I did it
src/sonic-utilities
```
* 0420ef92 - (HEAD -> 202503, origin/202503) Merge pull request #203 from mssonicbld/sonicbld/202503-merge (23 hours ago) [mssonicbld]
* da2ab2f5 - Merge branch '202412' of https://github.com/Azure/sonic-utilities.msft into 202503 (23 hours ago) [Sonic Automation]
* 1459455d - (origin/202412) [trim]: Add Packet Trimming Asym DSCP CLI (#202) (28 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
r12f added a commit that referenced this pull request Jul 16, 2025
…AD automatically (#1337)

#### Why I did it
src/sonic-utilities
```
* 1459455d - (HEAD -> 202412, origin/202412) [trim]: Add Packet Trimming Asym DSCP CLI (#202) (28 hours ago) [mssonicbld]
* 1e6c1324 - Merge pull request #200 from mssonicbld/sonicbld/202412-merge (5 days ago) [mssonicbld]
* 0522c0f9 - Merge branch '202411' of https://github.com/sonic-net/sonic-utilities into 202412 (5 days ago) [Sonic Automation]
* 58f250eb - backport PR 3947 (#3960) (5 days ago) [Liping Xu]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants