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

fix #155

Merged
merged 4 commits into from
Nov 28, 2023
Merged

fix #155

merged 4 commits into from
Nov 28, 2023

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: #155 is conflict with MS internal repo
Please complete the following PR by pushing fix commit to sonicbld/conflict_prefix/155-fix
https://msazure.visualstudio.com/One/_git/Networking-acs-buildimage/pullrequest/9019529
Then comment "/azpw ms_conflict" to rerun PR checker.

@liushilongbuaa
Copy link
Owner Author

/azpw ms_conflict

1 similar comment
@liushilongbuaa
Copy link
Owner Author

/azpw ms_conflict

@liushilongbuaa liushilongbuaa reopened this Nov 3, 2023
@mssonicbld
Copy link
Collaborator

@liushilongbuaa PR: #155 is conflict with MS internal repo
Please complete the following PR by pushing fix commit to sonicbld/conflict_prefix/155-fix
https://msazure.visualstudio.com/One/_git/Networking-acs-buildimage/pullrequest/9025911
Then comment "/azpw ms_conflict" to rerun PR checker.

@liushilongbuaa
Copy link
Owner Author

/azpw ms_conflict

@liushilongbuaa liushilongbuaa marked this pull request as ready for review November 3, 2023 06:32
@mssonicbld
Copy link
Collaborator

@liushilongbuaa PR: #155 is conflict with MS internal repo
Please complete the following PR by pushing fix commit to sonicbld/conflict_prefix/155-fix
https://msazure.visualstudio.com/One/_git/Networking-acs-buildimage/pullrequest/9025978
Then comment "/azpw ms_conflict" to rerun PR checker.

@liushilongbuaa
Copy link
Owner Author

/azpw ms_conflict

@liushilongbuaa liushilongbuaa merged commit 75523bc into 202211 Nov 28, 2023
4 checks passed
@liushilongbuaa liushilongbuaa added bug and removed bug labels Nov 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Approved for 202111 Branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@liushilongbuaa @mssonicbld