This repository was archived by the owner on Jan 22, 2025. It is now read-only.
stake: Advance credits_observed on activation epoch (backport #19309)#19626
Merged
mergify[bot] merged 2 commits intov1.7from Sep 4, 2021
Merged
stake: Advance credits_observed on activation epoch (backport #19309)#19626mergify[bot] merged 2 commits intov1.7from
credits_observed on activation epoch (backport #19309)#19626mergify[bot] merged 2 commits intov1.7from
Conversation
* stake: Advance `credits_observed` on activation epoch * Add test for merging stakes just after activation (cherry picked from commit 2c3bded) # Conflicts: # runtime/src/bank.rs
Contributor
|
😱 New commits were pushed while the automerge label was present. |
Codecov Report
@@ Coverage Diff @@
## v1.7 #19626 +/- ##
=======================================
Coverage 82.2% 82.2%
=======================================
Files 437 437
Lines 123934 123953 +19
=======================================
+ Hits 101926 101968 +42
+ Misses 22008 21985 -23 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #19309 done by Mergify.
Cherry-pick of 2c3bded has failed:
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 refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.io/