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

Add more reporting for invalid stake cache members and prune them (backport #21654)#21740

Merged
jstarry merged 2 commits intov1.8from
mergify/bp/v1.8/pr-21654
Dec 10, 2021
Merged

Add more reporting for invalid stake cache members and prune them (backport #21654)#21740
jstarry merged 2 commits intov1.8from
mergify/bp/v1.8/pr-21654

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Dec 9, 2021

This is an automatic backport of pull request #21654 done by Mergify.
Cherry-pick of 6fc3291 has failed:

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

You are currently cherry-picking commit 6fc329180.
  (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/stakes.rs
	modified:   sdk/src/feature_set.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   programs/bpf/Cargo.lock
	both modified:   runtime/Cargo.toml
	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

…1654)

* Add more reporting for invalid stake cache members

* feedback

(cherry picked from commit 6fc3291)

# Conflicts:
#	Cargo.lock
#	programs/bpf/Cargo.lock
#	runtime/Cargo.toml
#	runtime/src/bank.rs
@mergify mergify Bot added the conflicts label Dec 9, 2021
@jstarry jstarry self-assigned this Dec 10, 2021
@jstarry jstarry force-pushed the mergify/bp/v1.8/pr-21654 branch from 483ceb4 to 361e05e Compare December 10, 2021 16:25
@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 Dec 10, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 10, 2021

automerge label removed due to a CI failure

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

codecov Bot commented Dec 10, 2021

Codecov Report

Merging #21740 (361e05e) into v1.8 (7ac43b1) will decrease coverage by 0.0%.
The diff coverage is 61.3%.

@@            Coverage Diff            @@
##             v1.8   #21740     +/-   ##
=========================================
- Coverage    81.6%    81.6%   -0.1%     
=========================================
  Files         459      459             
  Lines      130443   130501     +58     
=========================================
+ Hits       106516   106543     +27     
- Misses      23927    23958     +31     

@jstarry jstarry merged commit 43e7368 into v1.8 Dec 10, 2021
@jstarry jstarry deleted the mergify/bp/v1.8/pr-21654 branch December 10, 2021 19:13
t-nelson added a commit to t-nelson/solana that referenced this pull request Dec 13, 2021
tao-stones pushed a commit that referenced this pull request Dec 13, 2021
CriesofCarrots pushed a commit to CriesofCarrots/solana that referenced this pull request Dec 16, 2021
CriesofCarrots pushed a commit that referenced this pull request Dec 17, 2021
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 5, 2022

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 Apr 5, 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