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

v1.16: removes feature-gate code for updating rewards from cached accounts (backport of #32514) #32669

Merged
merged 2 commits into from
Aug 3, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 31, 2023

This is an automatic backport of pull request #32514 done by Mergify.
Cherry-pick of 952d886 has failed:

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

You are currently cherry-picking commit 952d8861c6.
  (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_db.rs
	modified:   runtime/src/bank/metrics.rs
	modified:   runtime/src/bank/tests.rs
	modified:   runtime/src/stake_account.rs
	modified:   runtime/src/stakes.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://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

…32514)

(cherry picked from commit 952d886)

# Conflicts:
#	runtime/src/bank.rs
@codecov
Copy link

codecov bot commented Jul 31, 2023

Codecov Report

Merging #32669 (605d1c3) into v1.16 (4b06538) will decrease coverage by 0.1%.
The diff coverage is 100.0%.

@@            Coverage Diff            @@
##            v1.16   #32669     +/-   ##
=========================================
- Coverage    82.0%    81.9%   -0.1%     
=========================================
  Files         762      762             
  Lines      207777   207634    -143     
=========================================
- Hits       170402   170214    -188     
- Misses      37375    37420     +45     

@behzadnouri
Copy link
Contributor

Backporting this in order to backport #32633.

@behzadnouri behzadnouri added the automerge Merge this Pull Request automatically once CI passes label Jul 31, 2023
Copy link
Contributor

@jeffwashington jeffwashington left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm. I think @willhickey needs to approve?

@mergify mergify bot merged commit 4ba1c2a into v1.16 Aug 3, 2023
@mergify mergify bot deleted the mergify/bp/v1.16/pr-32514 branch August 3, 2023 14:39
@behzadnouri
Copy link
Contributor

This got merged automatically because of the automerge label.
@willhickey please confirm that you are ok with this or we can revert if not.

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.

2 participants