Skip to content

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

Merged
mssonicbld merged 3 commits intoAzure:202205from
mssonicbld:sonicbld/202205-merge
Oct 11, 2023
Merged

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

Conversation

@mssonicbld
Copy link
Collaborator

* 6f93832a0 - (head/202205) [chassisd]: Updated the API get_platform_info() to return running/detected ASIC's count (#16539) (2023-10-11) [abdosi]
* 3ac09d544 - [202205][buffers] Add 'create_only_config_db_buffers.json' file for the Mellanox devices (not MSFT SKU) (#16232) (2023-10-10) [Vadym Hlushko]<br>```

vadymhlushko-mlnx and others added 3 commits October 10, 2023 09:28
…he Mellanox devices (not MSFT SKU) (#16232)

* [buffers] Add create_only_config_db_buffers.json for MLNX devices (not MSFT SKU), inject it at the start of the swss docker

Signed-off-by: vadymhlushko-mlnx <vadymh@nvidia.com>

* [buffers] Align the sonic-device_metadata.yang

Signed-off-by: vadymhlushko-mlnx <vadymh@nvidia.com>

---------

Signed-off-by: vadymhlushko-mlnx <vadymh@nvidia.com>
…ected ASIC's count (#16539)

previously, get_num_asics() returns the maximum number of asics. however, the asic_count 
should be actual number of asics populated which can be get from get_asic_presence_list().

ADO: 25158825

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
@mssonicbld mssonicbld requested review from a team, lguohan and qiluo-msft as code owners October 11, 2023 03:01
@mssonicbld mssonicbld merged commit 8404563 into Azure:202205 Oct 11, 2023
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request May 3, 2024
…lly (#15929)

#### Why I did it
src/sonic-gnmi
```
* fb338d5 - (HEAD -> master, origin/master, origin/HEAD) Merge pull request Azure#135 from liuh-80/dev/liuh/cherry-pick-zmq (3 hours ago) [Hua Liu]
* f8d9c7e - Merge branch 'master' into dev/liuh/cherry-pick-zmq (8 hours ago) [Qi Luo]
* cbd5185 - Fix PR comments (26 hours ago) [liuh-80]
* 226fc31 - Fix PR comments (2 days ago) [liuh-80]
* 6579847 - Fix UT (3 days ago) [liuh-80]
* 53713c3 - Improve code coverage (3 days ago) [liuh-80]
* d8ff562 - Fix UT (3 days ago) [liuh-80]
* c3a66bc - Cherry-pick ZMQ change from nvidia repo (3 days ago) [liuh-80]
```
#### How I did it
#### How to verify it
#### Description for the changelog
r12f pushed a commit that referenced this pull request Dec 19, 2024
…utomatically (#19415)

#### Why I did it
src/sonic-host-services
```
* 02d9b55 - (HEAD -> master, origin/master, origin/HEAD) Added support to render template format of `delayed` flag on Feature Table. (#135) (28 hours ago) [abdosi]
* 60fdfea - Fixed determine/process reboot-cause service dependency (#17406) (#132) (13 days ago) [anamehra]
```
#### How I did it
#### How to verify it
#### Description for the changelog
liushilongbuaa pushed a commit that referenced this pull request Dec 26, 2024
…utomatically (#19551)

#### Why I did it
src/sonic-host-services
```
* aea0bef - (HEAD -> 202405, origin/202405) Ignore sonic_platform package fileNotFoundError on non-chassis vs platforms (#133) (#140) (4 minutes ago) [mssonicbld]
* 0e7e4d5 - Added support to render template format of `delayed` flag on Feature Table. (#135) (#137) (11 days ago) [mssonicbld]
* 235c2a4 - Fixed determine/process reboot-cause service dependency (#17406) (#132) (13 days ago) [anamehra]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Feb 28, 2025
…atically (#730)

#### Why I did it
src/sonic-utilities
```
* dd71c34a - (HEAD -> 202412, origin/202412) [code sync] Merge code from sonic-net/sonic-utilities:202411 to 202412 (#135) (9 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
prabhataravind pushed a commit that referenced this pull request Aug 13, 2025
…tomatically (#1499)

#### Why I did it
src/sonic-swss
```
* 2cb99113 - (HEAD -> 202506, origin/202506) [ssw][ha] create ha scope with VIPs from ha set (#135) (52 minutes ago) [mssonicbld]
* 8c8d6555 - Skip getting system ports for dpu as it is not supported (#134) (52 minutes ago) [mssonicbld]
* 3e476e78 - Enhance return code handling for queryEnumCapabilitiesSai (#133) (52 minutes ago) [mssonicbld]
* 0669f7d5 - [ssw][ha] add tunnel term ACL for transient state during DPU switchover (#132) (53 minutes ago) [mssonicbld]
* 5cdd9289 - [DASH] Add SAI API query for DASH trusted VNI (#131) (53 minutes ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit to mssonicbld/sonic-buildimage-msft that referenced this pull request Mar 2, 2026
…ically (#25742)

#### Why I did it
src/sonic-dash-ha
```
* 8f9893d - (HEAD -> 202511, origin/master, origin/HEAD, origin/202511, master) Create bfd sessions only to NPU participating ha-set (Azure#143) (9 days ago) [yue-fred-gao]
* a6cf697 - update dash-api submodule (10 days ago) [Jing Zhang]
* 64022eb - Change convert_pb_to_json to parse proto encoded value from binary input (Azure#142) (10 days ago) [yue-fred-gao]
* 53fb250 - [ci] fix build error and save binaries (Azure#144) (11 days ago) [Jing Zhang]
* d01ed94 - Add .github/copilot-instructions.md for AI-assisted development (Azure#140) (2 weeks ago) [rustiqly]
* 2b6b37c - Write DASH_DPU_RESET_INFO_TABLE when dpu midplane or control plane down (Azure#137) (4 weeks ago) [yue-fred-gao]
* 9b3c0bf - Add bfd rewrite on pmon change. (Azure#136) (4 weeks ago) [dypet]
* af44396 - [build] Disable debian helper auto install for cargo project. (Azure#135) (5 weeks ago) [Liu Shilong]
* 17e2e0b - Implement bfd pinned state (Azure#134) (5 weeks ago) [yue-fred-gao]
* c04969e - switch to using libboost1.83 (Azure#133) (6 weeks ago) [yijingyan2]
* b38d8fb - Change to DBConnector::clone_timeout_async (Azure#132) (3 months ago) [yue-fred-gao]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld pushed a commit to mssonicbld/sonic-buildimage-msft that referenced this pull request Mar 5, 2026
8f9893d (HEAD -> master, origin/master, origin/HEAD) Create bfd sessions only to NPU participating ha-set (Azure#143)
a6cf697 update dash-api submodule
64022eb Change convert_pb_to_json to parse proto encoded value from binary input (Azure#142)
53fb250 [ci] fix build error and save binaries  (Azure#144)
d01ed94 Add .github/copilot-instructions.md for AI-assisted development (Azure#140)
2b6b37c Write DASH_DPU_RESET_INFO_TABLE when dpu midplane or control plane down (Azure#137)
9b3c0bf Add bfd rewrite on pmon change. (Azure#136)
af44396 [build] Disable debian helper auto install for cargo project. (Azure#135)
17e2e0b Implement bfd pinned state (Azure#134)
c04969e switch to using libboost1.83 (Azure#133)
b38d8fb Change to DBConnector::clone_timeout_async (Azure#132)

sign-off: Jing Zhang zhangjing@microsoft.com
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