Skip to content

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

Merged
mssonicbld merged 2 commits intoAzure:202205from
mssonicbld:sonicbld/202205-merge
Sep 20, 2023
Merged

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

Conversation

@mssonicbld
Copy link
Collaborator

* d2fe62322 - (head/202205) [devices]: Dell S6100 API 2.0 fix (#16363) (2023-09-19) [Aravind Mani]<br>```

aravindmani-1 and others added 2 commits September 19, 2023 10:25
Why I did it
sonic-mgmt test failure is seen for update_firmware component API

Microsoft ADO: 25208748

How I did it
Edited API 2.0 to fix this issue.

How to verify it
Run sonic-mgmt test after the fix and verify it passes.
@mssonicbld mssonicbld requested a review from lguohan as a code owner September 20, 2023 03:01
@mssonicbld mssonicbld merged commit 65fb2a5 into Azure:202205 Sep 20, 2023
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request May 3, 2024
…lly (#15520)

#### Why I did it
src/sonic-gnmi
```
*   01fe667 - (HEAD -> master, origin/master, origin/HEAD) Merge pull request Azure#134 from FengPan-Frank/fenpan_dialout_rename (3 days ago) [Feng-msft]
|\  
| * 994c69c - Rename --enable-dialout option into ENABLE_DIALOUT to follow the convention. (3 days ago) [Feng Pan]
|/  
* a9126da - Update makefile to support armhf (Azure#132) (3 days ago) [ganglv]
* 0d80c0d -  prevent potential panic: return immediately if there exists error (Azure#113) (7 days ago) [Mai Bui]
*   3c0fca3 - Merge pull request Azure#131 from FengPan-Frank/fenpan_dialout (7 days ago) [Feng-msft]
|\  
| * c3d3266 - Add build flag into gnmi as --enable-dialout. (8 days ago) [Feng Pan]
|/  
* fd78c42 - add semgrep (Azure#126) (2 weeks ago) [Mai Bui]
* 214fa1c - TranslClient: Use new translib subscription APIs (Azure#122) (3 weeks ago) [Sachin Holla]
* 87d8eb3 - (origin/202305) TranslClient: use PathValidator to sanitize the request paths (Azure#112) (3 weeks ago) [Sachin Holla]
```
#### How I did it
#### How to verify it
#### Description for the changelog
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request May 3, 2024
…omatically (#17331)

#### Why I did it
src/sonic-mgmt-common
```
* d96bfcd - (HEAD -> master, origin/master, origin/HEAD) YANG tree generator and linter (Azure#113) (6 hours ago) [faraazbrcm]
```
#### How I did it
#### How to verify it
#### Description for the changelog
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request May 3, 2024
…utomatically (#18475)

#### Why I did it
src/sonic-host-services
```
* e93494c - (HEAD -> master, origin/master, origin/HEAD) Update sonic-host-services-data.determine-reboot-cause.service (Azure#119) (2 days ago) [Xincun Li]
* 15762a5 - Fix UT test data due to timestamp break. (Azure#117) (4 days ago) [Feng-msft]
* d53f431 - [caclmgrd]Fix bfd and vxlan acl rules programming in acl table update scenario (Azure#114) (13 days ago) [Sudharsan Dhamal Gopalarathnam]
* f2dbf25 - Add unittest for caclmgrd default deny rule (Azure#113) (2 weeks ago) [Zhijian Li]
* bfa06c7 - Change dependency option to fix buildimage issue. (Azure#110) (3 weeks ago) [Feng-msft]
* ba78bdb - Fix hostcfgd crash when delete entire config table. (Azure#106) (4 weeks ago) [Hua Liu]
* 6130886 - Update ProcessStats query by using API instead of parsing ps command. (Azure#103) (4 weeks ago) [Feng-msft]
```
#### How I did it
#### How to verify it
#### Description for the changelog
yxieca added a commit to yxieca/sonic-buildimage-msft that referenced this pull request Jul 24, 2025
*   f88c576c 2025-07-23 | Merge pull request Azure#110 from manamand2020/dualtor_prefixrt_neigh (msft/202501) [Ying Xie]
|\
| * 71987780 2025-07-23 | Removed deadcode [Manas Kumar Mandal]
| * 5ea83ae6 2025-07-17 | Port PR fix: dualtor MUX nbr to use no-host-route [Manas Kumar Mandal]
* 84a80921 2025-07-23 | Merge pull request Azure#111 from manamand2020/mux_nh_refcnt [Ying Xie]
* f592e6fb 2025-07-18 | Fix mux neighbor NH ref count [Manas Kumar Mandal]
* 2f603ccc 2025-07-24 | Merge pull request Azure#113 from manamand2020/mux_logcleanup (msft/202501) [Ying Xie]
* a21d7c23 2025-07-23 | Fix log level, soc nbrs are treated as mux nbrs [Manas Kumar Mandal]

Signed-off-by: Ying Xie <[email protected]>
yxieca added a commit that referenced this pull request Jul 24, 2025
* f88c576c 2025-07-23 | Merge pull request #110 from
manamand2020/dualtor_prefixrt_neigh (msft/202501) [Ying Xie]
|\
| * 71987780 2025-07-23 | Removed deadcode [Manas Kumar Mandal]
| * 5ea83ae6 2025-07-17 | Port PR fix: dualtor MUX nbr to use
no-host-route [Manas Kumar Mandal]
* 84a80921 2025-07-23 | Merge pull request #111 from
manamand2020/mux_nh_refcnt [Ying Xie]
* f592e6fb 2025-07-18 | Fix mux neighbor NH ref count [Manas Kumar
Mandal]
* 2f603ccc 2025-07-24 | Merge pull request #113 from
manamand2020/mux_logcleanup (msft/202501) [Ying Xie]
* a21d7c23 2025-07-23 | Fix log level, soc nbrs are treated as mux nbrs
[Manas Kumar Mandal]

<!--
Please make sure you've read and understood our contributing guidelines:
     https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

** Make sure all your commits include a signature generated with `git
commit -s` **

If this is a bug fix, make sure your description includes "fixes #xxxx",
or
     "closes #xxxx" or "resolves #xxxx"

     Please provide the following information:
-->

#### Why I did it

##### Work item tracking
- Microsoft ADO **(number only)**:

#### How I did it

#### How to verify it

<!--
If PR needs to be backported, then the PR must be tested against the
base branch and the earliest backport release branch and provide tested
image version on these two branches. For example, if the PR is requested
for master, 202211 and 202012, then the requester needs to provide test
results on master and 202012.
-->

#### Which release branch to backport (provide reason below if selected)

<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->

- [ ] 201811
- [ ] 201911
- [ ] 202006
- [ ] 202012
- [ ] 202106
- [ ] 202111
- [ ] 202205
- [ ] 202211

#### Tested branch (Please provide the tested image version)

<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->

- [ ] <!-- image version 1 -->
- [ ] <!-- image version 2 -->

#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->

<!--
Ensure to add label/tag for the feature raised. example - PR#2174 under
sonic-utilities repo. where, Generic Config and Update feature has been
labelled as GCU.
-->

#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on
https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->

#### A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: Ying Xie <[email protected]>
mssonicbld added a commit that referenced this pull request Sep 18, 2025
…tomatically (#1635)

#### Why I did it
src/sonic-gnmi
```
* 27f0121 - (HEAD -> 202412, origin/202412) Realize common functions for sfpshow. (#103) (4 minutes ago) [Yutong Zhang]
* 5e9a443 - Migrate option to argument for 'show interface transceiver presence' (#115) (54 minutes ago) [zitingguo-ms]
* 2eb0587 - Added telemetry support for 'show queue wredcounters', added support for the interface argument, and added unimplemented and no-op options. (#112) (3 hours ago) [mramezani95]
* 183721b - Update the ipaddress from option to arg (#113) (12 hours ago) [Guoqiang Yuan]
* 86bd856 - Add common subpackage under show_client to hold common functions (#114) (14 hours ago) [gnemuw]
* 4a2764f - Make interface as arg instead of option for `show interfaces transceiver error-status` (#108) (20 hours ago) [Yutong Zhang]
```
#### 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 (#24088)

#### Why I did it
src/sonic-dash-ha
```
* f36ffdd - (HEAD -> master, origin/master, origin/HEAD) Make deserializer more forgiven to parse dash_bfd_probe_state (#113) (6 hours ago) [yue-fred-gao]
* 0a719f6 - Proper handling of entry not found in incoming vs decoding error (#114) (6 hours ago) [yue-fred-gao]
* 2c589e7 - Unregister handlers after actor terminates (#115) (6 hours ago) [yue-fred-gao]
* b39c778 - Add local nexthop ip (#116) (6 hours ago) [dypet]
```
#### 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