Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Use estimated current slot in tpu client (backport #28997) #29016

Merged
merged 1 commit into from
Dec 1, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 1, 2022

This is an automatic backport of pull request #28997 done by Mergify.
Cherry-pick of 07d21d4 has failed:

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

You are currently cherry-picking commit 07d21d411.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by us:   tpu-client/src/nonblocking/tpu_client.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 the conflicts label Dec 1, 2022
@mergify mergify bot assigned pgarg66 Dec 1, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Dec 1, 2022
@pgarg66 pgarg66 force-pushed the mergify/bp/v1.14/pr-28997 branch from d9794f0 to bd383d9 Compare December 1, 2022 19:10
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 1, 2022
@solana-grimes
Copy link
Contributor

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

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Dec 1, 2022
@pgarg66
Copy link
Contributor

pgarg66 commented Dec 1, 2022

Backporting the fix to v1.14 as it's causing instabilities in the QUIC client.

@pgarg66 pgarg66 removed automerge Merge this Pull Request automatically once CI passes conflicts labels Dec 1, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Dec 1, 2022
Copy link
Contributor

@CriesofCarrots CriesofCarrots left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to make the history clear, this looks different from the master PR because we did not backport #28954 to v1.14, correct?

@pgarg66
Copy link
Contributor

pgarg66 commented Dec 1, 2022

Just to make the history clear, this looks different from the master PR because we did not backport #28954 to v1.14, correct?

Yes, that's correct. Also, files have been moved around on master. So I had to manually patch it.

@mergify mergify bot merged commit c730549 into v1.14 Dec 1, 2022
@mergify mergify bot deleted the mergify/bp/v1.14/pr-28997 branch December 1, 2022 21:00
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants