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

Handle already discarded packets in discard_excess_packets (backport #22594) #22634

Merged
merged 1 commit into from Jan 22, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 21, 2022

This is an automatic backport of pull request #22594 done by Mergify.
Cherry-pick of 38b02bb has failed:

On branch mergify/bp/v1.8/pr-22594
Your branch is up to date with 'origin/v1.8'.

You are currently cherry-picking commit 38b02bbcc.
  (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:   core/src/sigverify_stage.rs

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 conflicts automerge Merge this Pull Request automatically once CI passes labels Jan 21, 2022
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jan 21, 2022
@solana-grimes
Copy link
Collaborator

😱 New commits were pushed while the automerge label was present.

@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jan 21, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jan 21, 2022

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 21, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jan 21, 2022

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Jan 21, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 21, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jan 21, 2022

automerge label removed due to a CI failure

@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jan 21, 2022
@mergify mergify bot merged commit 9c01d90 into v1.8 Jan 22, 2022
@mergify mergify bot deleted the mergify/bp/v1.8/pr-22594 branch January 22, 2022 01:10
@github-actions
Copy link
Contributor

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 31, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts locked PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants