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

Handle removing slots during account scans (backport #17471)#17953

Merged
mergify[bot] merged 1 commit intov1.7from
mergify/bp/v1.7/pr-17471
Jun 22, 2021
Merged

Handle removing slots during account scans (backport #17471)#17953
mergify[bot] merged 1 commit intov1.7from
mergify/bp/v1.7/pr-17471

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jun 15, 2021

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

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

You are currently cherry-picking commit ccc013e13.
  (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:   client/src/rpc_custom_error.rs
	modified:   core/src/repair_service.rs
	modified:   core/src/replay_stage.rs
	modified:   ledger-tool/src/main.rs
	modified:   rpc/src/rpc.rs
	modified:   rpc/src/rpc_service.rs
	modified:   runtime/benches/accounts.rs
	modified:   runtime/src/accounts.rs
	modified:   runtime/src/accounts_background_service.rs
	modified:   runtime/src/accounts_db.rs
	modified:   runtime/src/accounts_index.rs
	modified:   runtime/src/ancestors.rs
	modified:   runtime/src/non_circulating_supply.rs
	modified:   sdk/program/src/clock.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/bank.rs

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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.io/

@mergify mergify Bot added the conflicts label Jun 15, 2021
@carllin carllin force-pushed the mergify/bp/v1.7/pr-17471 branch from 02cdfa1 to be2bb71 Compare June 21, 2021 21:44
@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 Jun 21, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jun 21, 2021

automerge label removed due to a CI failure

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jun 22, 2021
@codecov
Copy link
Copy Markdown

codecov Bot commented Jun 22, 2021

Codecov Report

Merging #17953 (be2bb71) into v1.7 (d52569d) will increase coverage by 0.0%.
The diff coverage is 87.7%.

@@           Coverage Diff            @@
##             v1.7   #17953    +/-   ##
========================================
  Coverage    82.5%    82.5%            
========================================
  Files         432      432            
  Lines      120355   120618   +263     
========================================
+ Hits        99342    99561   +219     
- Misses      21013    21057    +44     

@mergify mergify Bot merged commit 6f37648 into v1.7 Jun 22, 2021
@mergify mergify Bot deleted the mergify/bp/v1.7/pr-17471 branch June 22, 2021 01:20
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant