Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle accounts data size changes due to rent-collected accounts (backport #22412) #22919

Merged
merged 1 commit into from
Feb 4, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 3, 2022

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

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

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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/bank.rs
	both modified:   runtime/src/rent_collector.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 the conflicts label Feb 3, 2022
@brooksprumo brooksprumo self-assigned this Feb 3, 2022
@brooksprumo
Copy link
Contributor

@Mergifyio refresh

@mergify
Copy link
Contributor Author

mergify bot commented Feb 3, 2022

refresh

✅ Pull request refreshed

@brooksprumo
Copy link
Contributor

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Feb 3, 2022

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
Auto-merging runtime/src/bank.rs
Auto-merging runtime/src/rent_collector.rs
CONFLICT (content): Merge conflict in runtime/src/rent_collector.rs
error: could not apply 391ff4fdf... Handle accounts data size changes due to rent-collected accounts (#22412)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 391ff4fdf... Handle accounts data size changes due to rent-collected accounts (#22412)

err-code: BD385

@brooksprumo brooksprumo force-pushed the mergify/bp/v1.9/pr-22412 branch from 391ff4f to 1d63feb Compare February 3, 2022 22:24
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Feb 3, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Feb 4, 2022

automerge label removed due to a CI failure

@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 Feb 4, 2022
@mergify mergify bot merged commit 539f303 into v1.9 Feb 4, 2022
@codecov
Copy link

codecov bot commented Feb 4, 2022

Codecov Report

Merging #22919 (1d63feb) into v1.9 (85fef67) will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff           @@
##             v1.9   #22919   +/-   ##
=======================================
  Coverage    81.2%    81.2%           
=======================================
  Files         530      530           
  Lines      147140   147216   +76     
=======================================
+ Hits       119531   119612   +81     
+ Misses      27609    27604    -5     

@mergify mergify bot deleted the mergify/bp/v1.9/pr-22412 branch February 4, 2022 01:13
@github-actions
Copy link
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 30, 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