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.

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

conflict #142

Closed
wants to merge 1 commit into from
Closed

conflict #142

wants to merge 1 commit into from

Conversation

liushilongbuaa
Copy link
Owner

Why I did it

Work item tracking
  • Microsoft ADO (number only):

How I did it

How to verify it

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

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

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

@mssonicbld
Copy link
Collaborator

liushilongbuaa PR:
#142
Please resolve conflict and complete:
https://dev.azure.com/msazure/One/_git/Networking-acs-buildimage/pullrequest/

@mssonicbld
Copy link
Collaborator

liushilongbuaa PR:
#142
Please resolve conflict and complete:
https://dev.azure.com/msazure/One/_git/Networking-acs-buildimage/pullrequest/null

@mssonicbld
Copy link
Collaborator

liushilongbuaa PR:
#142
Please resolve conflict and complete:
https://dev.azure.com/msazure/One/_git/Networking-acs-buildimage/pullrequest/8760276

@mssonicbld
Copy link
Collaborator

liushilongbuaa pushed a commit that referenced this pull request Oct 27, 2023
…ically (sonic-net#15886)

src/sonic-restapi

* a69ba06 - (HEAD -> 202205, origin/master, origin/HEAD, origin/202205, master) [actions] Support Semgrep by Github Actions (#144) (3 weeks ago) [Mai Bui]
* 6b242a3 - [Ci] Upgrade python 2 to python 3 (#145) (3 weeks ago) [xumia]
* 1c50caa - prevent downcasting of 64-bit integer (#142) (2 months ago) [Mai Bui]
* de26989 - Use -race detector when building and testing (#141) (3 months ago) [Lawrence Lee]
* 9fe2eff - [go] Update Go to version 1.15 (#140) (3 months ago) [Lawrence Lee]
liushilongbuaa pushed a commit that referenced this pull request Aug 28, 2024
…utomatically (sonic-net#19897)

#### Why I did it
src/sonic-host-services
```
* 39e31a9 - (HEAD -> master, origin/master, origin/HEAD) Fix modify_single_file generate empty file issue (#145) (26 hours ago) [Hua Liu]
* 1891b0a - Add dbus service to read file stat (#142) (2 days ago) [isabelmsft]
```
#### How I did it
#### How to verify it
#### Description for the changelog
liushilongbuaa pushed a commit that referenced this pull request Oct 13, 2024
…omatically (sonic-net#20409)

#### Why I did it
src/sonic-mgmt-common
```
* b91a4df - (HEAD -> master, origin/master, origin/HEAD) PortChannel Interface Static Support - OpenConfig Yang (#142) (9 hours ago) [Satoru Shinohara]
```
#### 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