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

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 6, 2023

This is an automatic backport of pull request #33873 done by Mergify.


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

Return real parent blockhash, or default

(cherry picked from commit d6ac9be)
Copy link
Contributor

@bw-solana bw-solana left a comment

Choose a reason for hiding this comment

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

LGTM

@CriesofCarrots CriesofCarrots added the automerge Merge this Pull Request automatically once CI passes label Nov 6, 2023
@mergify mergify bot merged commit 561c95c into v1.17 Nov 6, 2023
@mergify mergify bot deleted the mergify/bp/v1.17/pr-33873 branch November 6, 2023 19:15
anwayde pushed a commit to firedancer-io/solana that referenced this pull request Nov 16, 2023
…olana-labs#33873) (solana-labs#33959)

Geyser: return real parent blockhash, or default (solana-labs#33873)

Return real parent blockhash, or default

(cherry picked from commit d6ac9be)

Co-authored-by: Tyera <[email protected]>
anwayde pushed a commit to firedancer-io/solana that referenced this pull request Nov 16, 2023
…olana-labs#33873) (solana-labs#33959)

Geyser: return real parent blockhash, or default (solana-labs#33873)

Return real parent blockhash, or default

(cherry picked from commit d6ac9be)

Co-authored-by: Tyera <[email protected]>
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