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 #631

Merged
merged 2 commits into from
May 19, 2024
Merged

frr: T6250: T6283: revert local patches merged upstream #631

merged 2 commits into from
May 19, 2024

Conversation

c-po
Copy link
Member

@c-po c-po 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

c-po added 2 commits May 19, 2024 08:24
@c-po
Revert "frr: T6250: add pending upstream patch"
2d6b51e 
This reverts commit 38cae97.

Upstream patch merged
@c-po
Revert "frr: T6283: add pending upstream patch"
e7fad57 
This reverts commit 1b61973.

Upstream Patch merged
@c-po c-po requested review from a team, dmbaturin, sarthurdev, zdc, jestabro and sever-sever and removed request for a team May 19, 2024 06:26
@c-po
Copy link
Member Author

c-po commented May 19, 2024

@Mergifyio backport sagitta

@c-po c-po merged commit fffe008 into vyos:current May 19, 2024
2 of 4 checks passed
@mergify Mergify
Copy link

mergify bot commented May 19, 2024 •
edited
Loading

backport sagitta

✅ Backports have been created

@mergify mergify bot mentioned this pull request May 19, 2024
Merged
11 tasks
c-po added a commit that referenced this pull request May 19, 2024
@c-po
Merge pull request #632 from vyos/mergify/bp/sagitta/pr-631
cf5a239 
frr: T6250: T6283: revert local patches merged upstream (backport #631)
@c-po c-po deleted the frr-revert-local-patches branch August 19, 2024 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@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

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

Assignees

@c-po c-po

Labels
current
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@c-po