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

stake: Remove v2 program references (backport #19308)#19336

Merged
mergify[bot] merged 3 commits intov1.7from
mergify/bp/v1.7/pr-19308
Aug 20, 2021
Merged

stake: Remove v2 program references (backport #19308)#19336
mergify[bot] merged 3 commits intov1.7from
mergify/bp/v1.7/pr-19308

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Aug 20, 2021

This is an automatic backport of pull request #19308 done by Mergify.
Cherry-pick of 73aa004 has failed:

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

You are currently cherry-picking commit 73aa004c5.
  (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:   cli/src/cluster_query.rs
	modified:   cli/src/stake.rs
	modified:   ledger-tool/src/main.rs
	modified:   program-test/tests/warp.rs
	modified:   programs/stake/src/stake_state.rs
	modified:   rpc/src/rpc.rs
	modified:   runtime/src/stakes.rs
	modified:   runtime/tests/stake.rs
	modified:   sdk/program/src/stake/state.rs
	modified:   sdk/src/feature_set.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.io/

* stake: Remove v2 program references

* Remove stake v2 feature, along with stake rewrite

(cherry picked from commit 73aa004)

# Conflicts:
#	runtime/src/bank.rs
@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Aug 20, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Aug 20, 2021

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Aug 20, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Aug 20, 2021
@joncinque joncinque force-pushed the mergify/bp/v1.7/pr-19308 branch from 8e8e0e0 to 4bd5671 Compare August 20, 2021 05:33
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Aug 20, 2021
@solana-grimes
Copy link
Copy Markdown
Contributor

😱 New commits were pushed while the automerge label was present.

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

mergify Bot commented Aug 20, 2021

automerge label removed due to a CI failure

@joncinque joncinque force-pushed the mergify/bp/v1.7/pr-19308 branch from 8d78d23 to 807ea90 Compare August 20, 2021 05:49
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Aug 20, 2021
@codecov
Copy link
Copy Markdown

codecov Bot commented Aug 20, 2021

Codecov Report

Merging #19336 (807ea90) into v1.7 (1495b94) will decrease coverage by 0.0%.
The diff coverage is 92.7%.

@@            Coverage Diff            @@
##             v1.7   #19336     +/-   ##
=========================================
- Coverage    82.3%    82.3%   -0.1%     
=========================================
  Files         436      436             
  Lines      123661   123455    -206     
=========================================
- Hits       101856   101672    -184     
+ Misses      21805    21783     -22     

@mergify mergify Bot merged commit b5b1ed2 into v1.7 Aug 20, 2021
@mergify mergify Bot deleted the mergify/bp/v1.7/pr-19308 branch August 20, 2021 07:32
@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.

2 participants