Skip to content

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

Merged
mssonicbld merged 3 commits intoAzure:202205from
mssonicbld:sonicbld/202205-merge
Sep 29, 2023
Merged

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

Conversation

@mssonicbld
Copy link
Collaborator

* ef7780d8f - (head/202205) [fast-reboot] Fix regression: set FAST_REBOOT state_db flag to support fast-reboot from older images (#16733) (#16754) (2023-09-29) [mssonicbld]
* 214ea0877 - [ssm]: Enable Store-And-Forward switching mode for SN2700/SN3800/SN4600C/SN4700. (#16662) (2023-09-28) [Nazarii Hnydyn]<br>```

@mssonicbld mssonicbld requested review from a team and lguohan as code owners September 29, 2023 03:01
@mssonicbld mssonicbld merged commit 7993c57 into Azure:202205 Sep 29, 2023
mssonicbld pushed a commit to mssonicbld/sonic-buildimage-msft that referenced this pull request Nov 24, 2023
79edf66 Longxiang Lyu Wed Aug 17 08:12:37 2022 +0800 Fix azure pipeline (Azure#118)
8e0f2c6 Longxiang Lyu Wed Aug 17 08:36:07 2022 +0800 Update linkmgr health after getting default route update (Azure#117)
b14ffb8 Jing Zhang Wed Aug 17 15:44:37 2022 -0700 [active-active] post mux metrics events (Azure#123)
a30dbb3 Jing Zhang Thu Aug 18 18:16:04 2022 -0700 Update handleMuxConfigNotification logic (Azure#125)
e14aaba Jing Zhang Tue Aug 23 10:02:17 2022 -0700 [active-active] Remove unnecessary mux wait timeout logs (Azure#122)
cc83717 Longxiang Lyu Fri Sep 2 02:17:53 2022 +0800 Fix mux config (Azure#128)
5429281 Mai Bui Thu Sep 1 17:44:04 2022 -0400 [linkmgrd] Replace memset function in link_prober (Azure#126)
b5aaec1 Jing Zhang Fri Sep 9 14:01:03 2022 -0700 [active-active] shutdown link prober when starting as isolated (Azure#130)
75f02cf Jing Zhang Tue Sep 13 10:34:32 2022 -0700 [active-standby] update warmboot reconciliation logic (Azure#129)
a5a9f90 Hua Liu Fri Sep 16 09:54:32 2022 +0800 Install libyang to azure pipeline (Azure#132)
6fe4f0f Jing Zhang Tue Sep 20 10:10:16 2022 -0700 [Active-Active] flaky LinkmgrdBootupSequence unit tests (Azure#134)
ea68e8c Jing Zhang Wed Sep 21 10:52:18 2022 -0700 Post switchover reasons to STATE DB (Azure#131)
60c35b5 Jing Zhang Thu Sep 22 13:00:41 2022 -0700 [Active-Active] server side admin forwarding state sync up (Azure#133)
08e1be5 Jing Zhang Mon Sep 26 10:59:27 2022 -0700 [Active-Active] avoid being stuck in unknown after process init (Azure#136)
2579988 Jing Zhang Mon Oct 3 09:40:55 2022 -0700 [Active-Standby] fix syslog flood caused by unkown -> standby switchovers (Azure#137)
7e9f670 Jing Zhang Wed Oct 5 10:03:45 2022 -0700 [Active-Active] Retry config mux mode standby (Azure#139)
23feb3b Jing Zhang Wed Oct 5 15:22:58 2022 -0700 [Active-Active] Post link prober stats to state db (Azure#140)
e650098 Jing Zhang Fri Oct 7 15:27:17 2022 -0700 [Active-Active] Update default route shutdown heartbeat logic (Azure#141)
d0653e7 Jing Zhang Tue Oct 11 10:22:02 2022 -0700 [Active-Standby] avoid posting mux metrics event when receiving unsolicited mux state notification (Azure#142)

dcf6460 Longxiang Lyu Fri Oct 21 12:15:42 2022 +0800 [active-active] Add support to send/handle mux probe request (Azure#147)
fdf42ed Longxiang Lyu Fri Oct 21 10:34:47 2022 +0800 Fix link prober state event report twice issue (Azure#149)
5fd19a3 Longxiang Lyu Mon Oct 17 09:20:27 2022 +0800 [active-active] Fix config reload (Azure#145)

sign-off: Jing Zhang zhangjing@microsoft.com
r12f pushed a commit that referenced this pull request Dec 19, 2024
…omatically (#18825)

#### Why I did it
src/sonic-mgmt-common
```
* 85119e8 - (HEAD -> master, origin/master, origin/HEAD) Adding support for OC YANG interfaces (#125) (30 hours ago) [Nikita Agarwal]
```
#### 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 (#18959)

#### Why I did it
src/sonic-host-services
```
* 10bfa90 - (HEAD -> master, origin/master, origin/HEAD) Add new API to support config replace (#125) (25 hours ago) [ganglv]
* 1a8ff81 - Fix issue: delayed service will not be restarted if swss crashes (#107) (3 days ago) [Junchao-Mellanox]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Feb 21, 2025
…atically (#658)

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

#### Why I did it
src/sonic-swss
```
* d1cfece3 - (HEAD -> 202503, origin/202503) Merge pull request #125 from mssonicbld/sonicbld/202503-merge (23 hours ago) [mssonicbld]
* 6bd3ba34 - Merge branch '202412' of https://github.com/Azure/sonic-swss.msft into 202503 (23 hours ago) [Sonic Automation]
* ae7c6b32 - (origin/202412) Enhance return code handling for queryEnumCapabilitiesSai (#124) (2 days ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Sep 26, 2025
…tomatically (#1650)

#### Why I did it
src/sonic-gnmi
```
* d9876f1 - (HEAD -> 202412, origin/202412) update (#126) (2 hours ago) [jiayuj2021]
* acbf7b5 - [202412] Add support for show ndp (#99) (17 hours ago) [zitingguo-ms]
* 841bc1e - Add SHOW implementation for interfaces transceiver eeprom and interfaces transceiver info (#78) (18 hours ago) [Yutong Zhang]
* 5530333 - Enrich unit testing for 'show ipv6 bgp network' (#121) (20 hours ago) [Zhaoyang Zhang]
* 7371f41 - Deepak pandey/add show arp (#125) (20 hours ago) [Deepak-Pandey]
```
#### How I did it
#### How to verify it
#### Description for the changelog
bingwang-ms pushed a commit that referenced this pull request Jan 16, 2026
…ically (#24377)

#### Why I did it
src/sonic-dash-ha
```
* c2fa656 - (HEAD -> master, origin/master, origin/HEAD) Add custom_bfd (#125) (27 hours ago) [yue-fred-gao]
```
#### 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