Skip to content

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

Merged
mssonicbld merged 4 commits intoAzure:202305from
mssonicbld:sonicbld/202305-merge
Feb 27, 2024
Merged

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

Conversation

@mssonicbld
Copy link
Collaborator

* 612407a9b - (head/202305) Only add to DHCP_RELAY if dhcpv6 servers exist (#17770) (2024-02-26) [kellyyeh]
* 5d43f7c51 - handle json load exception in bgpmon (#17856) (2024-02-26) [Liping Xu]
* 8ef47bf85 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#18177) (2024-02-26) [mssonicbld]<br>```

mssonicbld and others added 4 commits February 26, 2024 19:50
…lly (#18177)

#### Why I did it
src/sonic-swss
```
* 5d91f105 - (HEAD -> 202305, origin/202305) Allow L4 port range egress ACL rules on DNX (#3014) (2 days ago) [arista-nwolfe]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Why I did it
ICM reported due to "BGPMon Process exited" which was caused by json load exception.

Work item tracking
Microsoft ADO (number only):
25916773
How I did it
Add an exception handle during json load.

How to verify it
Verified locally, add debug log to modify the output string of cmd to make it not with json formation, then check the syslog.
@mssonicbld mssonicbld merged commit af18671 into Azure:202305 Feb 27, 2024
r12f pushed a commit that referenced this pull request Dec 19, 2024
…lly (#20864)

#### Why I did it
src/sonic-gnmi
```
* 2c4b9c8 - (HEAD -> master, origin/master, origin/HEAD) Add swss-common log level support to gnmi (#330) (21 hours ago) [Hua Liu]
* d77883d - Merge pull request #309 from wumiaont/master (24 hours ago) [Rita Hui]
|\ 
| failure_prs.log 80067ec - Fix a panic by gnmi subscribe with invalid xpath (5 weeks ago) [wumiao]
* e6bc0e7 - Add cert CRL support. (#269) (3 days ago) [Hua Liu]
```
#### How I did it
#### How to verify it
#### Description for the changelog
prabhataravind pushed a commit that referenced this pull request Jul 7, 2025
…utomatically (#22660)

#### Why I did it
src/sonic-host-services
```
* 0206da1 - (HEAD -> 202505, origin/202505) Revert "[featured] fix non existing feature start (#234)" (#273) (51 minutes ago) [mssonicbld]
* d4d624e - Add iptables rules to drop all bgp packets destined for loopback1 IP addresses in dual ToR (#269) (10 days ago) [mssonicbld]
* 93db579 - Fix PyGObject required version (#265) (2 weeks ago) [mssonicbld]
* 112acad - [build] Update Azure pipeline to use Ubuntu 24.04 image (#266) (2 weeks ago) [mssonicbld]
* 1ee792e - Implement Download and Delete For File Service (#242) (5 weeks ago) [Dawei Huang]
* 00393e3 - [kdump-config] Update kdump default config with pre-defined value in /proc/cmdline (installer.conf) (#237) (7 weeks ago) [Marty Y. Lok]
* d028745 - [Radius] Add require_message_authenticator option to fix BlastRadius issue. (#172) (7 weeks ago) [Julian Chang]
* 8237b5d - Monitor rsyslog feature flag change and update rsyslog config by restart rsyslog-config service (#245) (7 weeks ago) [Hua Liu]
* 55cee71 - Improve Detection Logic for HALT Command in is_halt_command_running() (#247) (8 weeks ago) [Vasundhara Volam]
* 29b8be8 - [featured] fix non existing feature start (#234) (3 months ago) [Stepan Blyshchak]
* fe90cb1 - Adding support for filtering by destination IP and/or incoming interface to caclmgrd. (#195) (3 months ago) [nyanto]
* 6006e05 - caclmgrd interface rules patch 1 (#197) (3 months ago) [Nanma Purushotam]
* 3ba0c59 - Pin PyGObject to 3.50.0 (#228) (3 months ago) [cpackham-atlnz]
* 5445cf6 - Radius Access request to use configured src interface (#230) (3 months ago) [lakshmi-nexthop]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Jan 9, 2026
…AD automatically (#1925)

#### Why I did it
src/sonic-utilities
```
* eb456fc0 - (HEAD -> 202412, origin/202412) [hft]: HFT config/show cli (#269) (4 hours ago) [mssonicbld]
```
#### 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.

3 participants