Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#232

Merged
mssonicbld merged 2 commits intoAzure:202205from
mssonicbld:sonicbld/202205-merge
Jan 23, 2024
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#232
mssonicbld merged 2 commits intoAzure:202205from
mssonicbld:sonicbld/202205-merge

Conversation

@mssonicbld
Copy link
Collaborator

* d1ba80c6e - (head/202205) [dhcp-relay]: dhcp/dhcpv6 per interface counter support (#16377) (2024-01-22) [jcaiMR]<br>```

jcaiMR and others added 2 commits January 22, 2024 18:36
Why I did it
Support DHCP/DHCPv6 per-interface counter, code change in sonic-build image.

Work item tracking
Microsoft ADO (17271822):

How I did it
- Introduce libjsoncpp-dev in dhcpmon and dhcprelay repo
- Show CLI changes after counter format change

How to verify it
- Manually run show command
- dhcpmon, dhcprelay integration tests
@mssonicbld mssonicbld requested a review from lguohan as a code owner January 23, 2024 03:02
@mssonicbld mssonicbld merged commit f2512e6 into Azure:202205 Jan 23, 2024
r12f pushed a commit that referenced this pull request Dec 19, 2024
…lly (#18899)

#### Why I did it
src/sonic-gnmi
```
* adece7c - (HEAD -> master, origin/master, origin/HEAD) Merge pull request #234 from saiarcot895/use-latest-swsscommon (3 days ago) [Saikrishna Arcot]
|\ 
| failure_prs.log 82c57c7 - Merge branch 'master' into use-latest-swsscommon (4 days ago) [Saikrishna Arcot]
| |\ 
| |/ 
|/| 
* | d442e7a - Fix memory leak in unit test (#235) (4 days ago) [Hua Liu]
| failure_prs.log ec15a40 - Use the latest libswsscommon artifacts from the repo (4 days ago) [Saikrishna Arcot]
|/ 
* d16d1ca - Fix mixed_db_client ZMQ memory leak. (#232) (6 days ago) [Hua Liu]
* abe3ec0 - Merge pull request #227 from liuh-80/dev/liuh/fix_zmq_memory_leak (6 days ago) [Hua Liu]
* 7949eff - Fix indent issue (6 days ago) [liuh-80]
* 50c6c6d - Merge remote-tracking branch 'origin' into dev/liuh/fix_zmq_memory_leak (6 days ago) [liuh-80]
* 43b6fe5 - Improve code (6 days ago) [liuh-80]
* 709be76 - Fix ZMQ memory leak (7 days ago) [liuh-80]
```
#### How I did it
#### How to verify it
#### Description for the changelog
prabhataravind pushed a commit that referenced this pull request Aug 19, 2025
…AD automatically (#1531)

#### Why I did it
src/sonic-utilities
```
* 3ca919f8 - (HEAD -> 202506, origin/202506) Merge pull request #232 from mssonicbld/sonicbld/202506-merge (23 hours ago) [mssonicbld]
* 0682dbf3 - Merge branch '202505' of https://github.com/sonic-net/sonic-utilities into 202506 (23 hours ago) [Sonic Automation]
* 5a3608d3 - Fix show int transceiver EEPROM crash for for Backplane cartridge + enhance EEPROM CLI output (#4032) (24 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.

2 participants