Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up demote program write lock feature (backport #21949) #21969

Merged
merged 2 commits into from
Dec 17, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 16, 2021

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

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

You are currently cherry-picking commit 6ff0be6a8.
  (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-output/src/display.rs
	modified:   core/src/banking_stage.rs
	modified:   core/src/qos_service.rs
	modified:   ledger-tool/src/main.rs
	modified:   program-runtime/src/invoke_context.rs
	modified:   program-test/src/lib.rs
	modified:   rpc/src/transaction_status_service.rs
	modified:   runtime/src/bank.rs
	modified:   runtime/src/cost_model.rs
	modified:   sdk/benches/serialize_instructions.rs
	modified:   sdk/program/src/message/legacy.rs
	modified:   sdk/program/src/message/sanitized.rs
	modified:   sdk/program/src/message/versions/v0/loaded.rs
	modified:   sdk/program/src/sysvar/instructions.rs
	modified:   sdk/src/transaction/mod.rs
	modified:   sdk/src/transaction/sanitized.rs
	modified:   transaction-status/src/parse_accounts.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   programs/bpf_loader/src/syscalls.rs
	both modified:   runtime/src/accounts.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

* Clean up demote program write lock feature

* fix test

(cherry picked from commit 6ff0be6)

# Conflicts:
#	programs/bpf_loader/src/syscalls.rs
#	runtime/src/accounts.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Dec 16, 2021
@solana-grimes
Copy link
Contributor

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

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 16, 2021
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Dec 16, 2021
@codecov
Copy link

codecov bot commented Dec 17, 2021

Codecov Report

Merging #21969 (e4262e2) into v1.9 (0c5a2bc) will decrease coverage by 0.0%.
The diff coverage is 92.6%.

@@            Coverage Diff            @@
##             v1.9   #21969     +/-   ##
=========================================
- Coverage    81.2%    81.2%   -0.1%     
=========================================
  Files         515      515             
  Lines      143800   143751     -49     
=========================================
- Hits       116882   116840     -42     
+ Misses      26918    26911      -7     

@mergify mergify bot merged commit f452100 into v1.9 Dec 17, 2021
@mergify mergify bot deleted the mergify/bp/v1.9/pr-21949 branch December 17, 2021 04:45
@brooksprumo brooksprumo mentioned this pull request Jan 5, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Apr 4, 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 4, 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.

2 participants