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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 3 commits into from
Oct 11, 2023
Merged

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

merged 3 commits into from
Oct 11, 2023

Conversation

mssonicbld
Copy link
Contributor 

* 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
@vadymhlushko-mlnx
[202205][buffers] Add 'create_only_config_db_buffers.json' file for t…
3ac09d5 
…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>
@abdosi @mssonicbld
[chassisd]: Updated the API get_platform_info() to return running/det…
6f93832 
…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
Merge branch '202205' of https://github.com/sonic-net/sonic-buildimage …
6dc8fc0 
…into 202205
@mssonicbld mssonicbld requested review from qiluo-msft, a team and lguohan as code owners October 11, 2023 03:01
@mssonicbld mssonicbld merged commit 8404563 into Azure:202205 Oct 11, 2023
3 checks passed
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request May 3, 2024
@mssonicbld
[submodule] Update submodule sonic-gnmi to the latest HEAD automatica…
19638a4 
…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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@qiluo-msft qiluo-msft Awaiting requested review from qiluo-msft qiluo-msft is a code owner

@lguohan lguohan Awaiting requested review from lguohan lguohan is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mssonicbld @vadymhlushko-mlnx @abdosi