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

Remove activated feature for removing inactive delegations from stakes cache (backport #21732)#21887

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

Remove activated feature for removing inactive delegations from stakes cache (backport #21732)#21887
mergify[bot] wants to merge 1 commit intov1.9from
mergify/bp/v1.9/pr-21732

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Dec 14, 2021

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

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

You are currently cherry-picking commit c92c09a8b.
  (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/bank.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	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

@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Dec 14, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 14, 2021

automerge label removed due to a CI failure

@jstarry jstarry force-pushed the mergify/bp/v1.9/pr-21732 branch from 5f7a271 to fb85ca0 Compare December 14, 2021 20:11
@jstarry jstarry added automerge Merge this Pull Request automatically once CI passes and removed conflicts labels Dec 14, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 14, 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 14, 2021
@jstarry
Copy link
Copy Markdown
Contributor

jstarry commented Jan 4, 2022

Mixed up the backport with another feature removal. Also, this isn't critical

@jstarry jstarry closed this Jan 4, 2022
@mergify mergify Bot deleted the mergify/bp/v1.9/pr-21732 branch January 4, 2022 21:33
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant