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

frr: T6250: T6283: revert local patches merged upstream (backport #631) #632

Merged
merged 2 commits into from
May 19, 2024
Merged

frr: T6250: T6283: revert local patches merged upstream (backport #631) #632

merged 2 commits into from
May 19, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 19, 2024

Change Summary

Revert commits as the patches have been integrated upstream

FRRouting/frr#15959

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe):

Related Task(s)

Component(s) name

FRR

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly
This is an automatic backport of pull request #631 done by [Mergify](https://mergify.com).

c-po added 2 commits May 19, 2024 06:27
@c-po @mergify
Revert "frr: T6250: add pending upstream patch"
696fc10 
This reverts commit 38cae97.

Upstream patch merged

(cherry picked from commit 2d6b51e)
@c-po @mergify
Revert "frr: T6283: add pending upstream patch"
e6b7668 
This reverts commit 1b61973.

Upstream Patch merged

(cherry picked from commit e7fad57)
@mergify mergify bot mentioned this pull request May 19, 2024
Merged
11 tasks
@github-actions github-actions bot added the sagitta VyOS 1.4 LTS label May 19, 2024
@c-po c-po requested review from a team, dmbaturin, sarthurdev, zdc, jestabro, sever-sever and c-po and removed request for a team May 19, 2024 06:30
@c-po c-po merged commit cf5a239 into sagitta May 19, 2024
3 of 4 checks passed
@mergify mergify bot deleted the mergify/bp/sagitta/pr-631 branch May 19, 2024 07:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@c-po c-po c-po approved these changes

@sever-sever sever-sever sever-sever approved these changes

@dmbaturin dmbaturin Awaiting requested review from dmbaturin dmbaturin is a code owner automatically assigned from vyos/reviewers

@sarthurdev sarthurdev Awaiting requested review from sarthurdev sarthurdev is a code owner automatically assigned from vyos/reviewers

@zdc zdc Awaiting requested review from zdc zdc is a code owner automatically assigned from vyos/reviewers

@jestabro jestabro Awaiting requested review from jestabro jestabro is a code owner automatically assigned from vyos/reviewers

Assignees
No one assigned
Labels
sagitta VyOS 1.4 LTS
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@sever-sever @c-po