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

Remove unused fields from Bank (backport #22491)#22630

Merged
mergify[bot] merged 2 commits intov1.9from
mergify/bp/v1.9/pr-22491
Jan 22, 2022
Merged

Remove unused fields from Bank (backport #22491)#22630
mergify[bot] merged 2 commits intov1.9from
mergify/bp/v1.9/pr-22491

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jan 21, 2022

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

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

You are currently cherry-picking commit 9977396d8.
  (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/serde_snapshot/future.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 9977396)

# Conflicts:
#	runtime/src/serde_snapshot/future.rs
@mergify mergify Bot added the conflicts label Jan 21, 2022
@brooksprumo brooksprumo self-assigned this Jan 21, 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 Jan 21, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jan 21, 2022

automerge label removed due to a CI failure

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jan 21, 2022
@mergify mergify Bot merged commit 187ed6a into v1.9 Jan 22, 2022
@codecov
Copy link
Copy Markdown

codecov Bot commented Jan 22, 2022

Codecov Report

Merging #22630 (6233cd2) into v1.9 (2ddb5b2) will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff           @@
##             v1.9   #22630   +/-   ##
=======================================
  Coverage    81.1%    81.2%           
=======================================
  Files         527      527           
  Lines      146519   146502   -17     
=======================================
+ Hits       118958   118995   +37     
+ Misses      27561    27507   -54     

@mergify mergify Bot deleted the mergify/bp/v1.9/pr-22491 branch January 22, 2022 00:13
@github-actions
Copy link
Copy Markdown
Contributor

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Mar 31, 2022
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 conflicts locked PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant