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

[202311][swss submodule] Revert bgp suppress fib pending #17915

Merged
merged 1 commit into from
Jan 26, 2024

Conversation

yxieca
Copy link
Contributor

@yxieca yxieca commented Jan 26, 2024

Revert "Revert "[202311] Revert bgp suppress fib pending" (#17882)"

This reverts commit 1ccee47.

sonic-swss:

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)

Revert "Revert "[202311] Revert bgp suppress fib pending" (sonic-net#17882)"

This reverts commit 1ccee47.

sonic-utilities:
* be294f39 2024-01-25 | [202311] Revert bgp suppress fib pending (sonic-net#3003) (HEAD -> 202311, github/202311) [Stepan Blyshchak]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
@mssonicbld
Copy link
Collaborator

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

@yxieca
Copy link
Contributor Author

yxieca commented Jan 26, 2024

/azpw ms_conflict

@yxieca yxieca changed the title [202311][sonic-utilities] Revert bgp suppress fib pending [202311][swss submodule] Revert bgp suppress fib pending Jan 26, 2024
@yxieca yxieca merged commit 388c3f5 into sonic-net:202311 Jan 26, 2024
19 checks passed
@yxieca yxieca deleted the 202311 branch January 26, 2024 21:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants