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

core: disable quic servers on mainnet-beta (backport #26042) #26045

Merged
merged 1 commit into from
Jun 18, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 18, 2022

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

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

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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/validator.rs
	both modified:   local-cluster/src/validator_configs.rs
	both modified:   validator/src/main.rs

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 Jun 18, 2022
@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 Jun 18, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jun 18, 2022

automerge label removed due to a CI failure

(cherry picked from commit a5f290a)

# Conflicts:
#	core/src/validator.rs
#	local-cluster/src/validator_configs.rs
#	validator/src/main.rs
@t-nelson t-nelson force-pushed the mergify/bp/v1.10/pr-26042 branch from f3f2590 to ae90ba7 Compare June 18, 2022 02:12
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 18, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jun 18, 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 Jun 18, 2022
@mergify mergify bot merged commit 1a0b783 into v1.10 Jun 18, 2022
@mergify mergify bot deleted the mergify/bp/v1.10/pr-26042 branch June 18, 2022 04:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant