Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Dec 29, 2023

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
3 checks passed
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]
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