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

stake: Allow stakes with unmatched credits observed to merge (backport #18985) #19055

Merged
merged 4 commits into from
Aug 4, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 4, 2021

This is an automatic backport of pull request #18985 done by Mergify.
Cherry-pick of 2b33c0c has failed:

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

You are currently cherry-picking commit 2b33c0c16.
  (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:   programs/stake/src/stake_state.rs

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

* stake: Allow stakes with unmatched credits observed to merge

* Address feedback

* Remove branch by doing a ceiling in one calc

(cherry picked from commit 2b33c0c)

# Conflicts:
#	Cargo.lock
#	programs/stake/Cargo.toml
#	sdk/src/feature_set.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Aug 4, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Aug 4, 2021

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 Aug 4, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Aug 4, 2021

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 Aug 4, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Aug 4, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Aug 4, 2021
@codecov
Copy link

codecov bot commented Aug 4, 2021

Codecov Report

Merging #19055 (4901088) into v1.7 (7d0a9e0) will increase coverage by 0.0%.
The diff coverage is 99.0%.

@@           Coverage Diff            @@
##             v1.7   #19055    +/-   ##
========================================
  Coverage    82.3%    82.3%            
========================================
  Files         436      436            
  Lines      123179   123287   +108     
========================================
+ Hits       101390   101498   +108     
  Misses      21789    21789            

@mergify mergify bot merged commit 1a0146f into v1.7 Aug 4, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-18985 branch August 4, 2021 17:43
@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