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 #192

Merged
merged 6 commits into from
Dec 19, 2023
Merged

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

merged 6 commits into from
Dec 19, 2023

Conversation

mssonicbld
Copy link
Collaborator 

* 5a4c51aaa - (head/202205) [Dell] S6100 - Update EEPROM API serial_number_str to return service tag instead of serial number (#17440) (#17493) (2023-12-18) [mssonicbld]
* b278f161a - [ci/build]: Upgrade SONiC package versions (#17541) (2023-12-18) [mssonicbld]
* 7294103e6 - [202205][Mellanox] Add mlxtrace to techsupport (#15961) (#15982) (2023-12-18) [Vadym Hlushko]
* 603ed3e48 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#17545) (2023-12-18) [mssonicbld]
* 4d5604a9e - [submodule] Update submodule linkmgrd to the latest HEAD automatically (#17536) (2023-12-18) [mssonicbld]<br>```

mssonicbld and others added 6 commits December 18, 2023 13:53
@mssonicbld
[submodule] Update submodule linkmgrd to the latest HEAD automaticall…
4d5604a 
…y (#17536)

src/linkmgrd

* 6fa4adb - (HEAD -> 202205, origin/202205) [active-standby] Fix `show mux status` inconsistency introduced by orchagent rollback  (Azure#225) (Azure#226) (2 days ago) [Jing Zhang]
@mssonicbld
[submodule] Update submodule sonic-swss to the latest HEAD automatica…
603ed3e 
…lly (#17545)

src/sonic-swss

* 19affd32 - (HEAD -> 202205, origin/202205) [muxorch][202205] Fixing cache bug in updateRoute logic (#2994) (3 hours ago) [Nikola Dancejic]
@vadymhlushko-mlnx
[202205][Mellanox] Add mlxtrace to techsupport (#15961) (#15982)
7294103 
* [mlxtrace] Add mft-fwtrace-cfg.deb which contains fwtrace_cfg files for the mlxtrace utility

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

* [mlxtrace] Remove mlxtrace support for SPC4

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

---------

Signed-off-by: vadymhlushko-mlnx <vadymh@nvidia.com>
@mssonicbld
[ci/build]: Upgrade SONiC package versions (#17541)
b278f16
@mssonicbld @ArunSaravananBalachandran
[Dell] S6100 - Update EEPROM API serial_number_str to return service …
5a4c51a 
…tag instead of serial number (#17440) (#17493)

To modify EEPROM API serial_number_str to return service tag instead of serial number in Dell S6100.
Ref PR: #1239

How I did it
Update EEPROM API serial_number_str to return service tag instead of serial number.

How to verify it
Verify decode-syseeprom -s returns service tag in Dell S6100.

Co-authored-by: Arun Saravanan Balachandran <52521751+ArunSaravananBalachandran@users.noreply.github.com>
@mssonicbld
Merge branch '202205' of https://github.com/sonic-net/sonic-buildimage …
bdc1607 
…into 202205
@mssonicbld mssonicbld requested review from a team and lguohan as code owners December 19, 2023 03:02
@mssonicbld mssonicbld merged commit 4c32ba1 into Azure:202205 Dec 19, 2023
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@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.
2 participants
@mssonicbld @vadymhlushko-mlnx