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

T5812: report actual number of revisions instead of max (backport #2613) #2616

Merged
merged 1 commit into from
Dec 11, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 11, 2023

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

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

You are currently cherry-picking commit ccbf03f1a.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   python/vyos/config_mgmt.py

no changes added to commit (use "git add" and/or "git commit -a")

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

@mergify mergify bot added the conflicts label Dec 11, 2023
@vyosbot vyosbot requested a review from a team December 11, 2023 18:18
@github-actions github-actions bot added the sagitta VyOS 1.4 LTS label Dec 11, 2023
@vyosbot vyosbot requested review from dmbaturin, sarthurdev, zdc, jestabro, sever-sever and c-po and removed request for a team December 11, 2023 18:18
@sever-sever
Copy link
Member

Needs to rebase it after merging #2615

@sever-sever
Copy link
Member

@Mergifyio rebase

Copy link
Author

mergify bot commented Dec 11, 2023

rebase

☑️ Nothing to do

  • -conflict [:pushpin: rebase requirement]
  • -closed [:pushpin: rebase requirement]

@sever-sever sever-sever merged commit bc46027 into sagitta Dec 11, 2023
3 checks passed
@mergify mergify bot deleted the mergify/bp/sagitta/pr-2613 branch December 11, 2023 19:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3 participants