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

T1797: Remove vpp packages and mentions (backport #2464) #2465

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 9, 2023

This is an automatic backport of pull request #2464 done by Mergify.
Cherry-pick of e10cf9f has failed:

On branch mergify/bp/sagitta/pr-2464
Your branch is up to date with 'origin/sagitta'.

You are currently cherry-picking commit e10cf9f42.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   debian/vyos-1x.preinst
	modified:   op-mode-definitions/monitor-log.xml.in
	modified:   op-mode-definitions/show-log.xml.in

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   debian/control

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit e10cf9f)

# Conflicts:
#	debian/control
@mergify mergify bot added the conflicts label Nov 9, 2023
@mergify mergify bot mentioned this pull request Nov 9, 2023
12 tasks
@vyosbot vyosbot requested review from a team, dmbaturin, sarthurdev, zdc, jestabro, sever-sever and c-po and removed request for a team November 9, 2023 18:18
@github-actions github-actions bot added the sagitta VyOS 1.4 LTS label Nov 9, 2023
@sever-sever
Copy link
Member

PR has conflicts. Close it

@sever-sever sever-sever closed this Nov 9, 2023
@mergify mergify bot deleted the mergify/bp/sagitta/pr-2464 branch November 9, 2023 18:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

1 participant