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

Add StakesCache struct to abstract away locking (backport #21738)#21771

Closed
mergify[bot] wants to merge 1 commit intov1.8from
mergify/bp/v1.8/pr-21738
Closed

Add StakesCache struct to abstract away locking (backport #21738)#21771
mergify[bot] wants to merge 1 commit intov1.8from
mergify/bp/v1.8/pr-21738

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Dec 10, 2021

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

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

You are currently cherry-picking commit fd175c1ea.
  (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:   runtime/src/serde_snapshot/future.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/bank.rs
	both modified:   runtime/src/serde_snapshot/tests.rs
	both modified:   runtime/src/stakes.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

(cherry picked from commit fd175c1)

# Conflicts:
#	runtime/src/bank.rs
#	runtime/src/serde_snapshot/tests.rs
#	runtime/src/stakes.rs
@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Dec 10, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 10, 2021

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Dec 10, 2021
@jstarry jstarry closed this Dec 10, 2021
@mergify mergify Bot deleted the mergify/bp/v1.8/pr-21738 branch December 10, 2021 19:16
@jstarry
Copy link
Copy Markdown
Contributor

jstarry commented Dec 10, 2021

@Mergifyio refresh

@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 10, 2021

refresh

✅ Pull request refreshed

@jstarry
Copy link
Copy Markdown
Contributor

jstarry commented Dec 10, 2021

@Mergifyio rebase

@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 10, 2021

rebase

☑️ Nothing to do

Details
  • -closed [:pushpin: rebase requirement]
  • #commits-behind>0 [:pushpin: rebase requirement]

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant