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

Increase transaction account lock limit from 64 to 128 (backport #27242) #27810

Merged
merged 2 commits into from
Sep 16, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 15, 2022

This is an automatic backport of pull request #27242 done by Mergify.
Cherry-pick of b970024 has failed:

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

You are currently cherry-picking commit b9700244b.
  (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/bpf/tests/programs.rs
	modified:   programs/bpf_loader/src/syscalls/cpi.rs
	modified:   sdk/bpf/c/inc/sol/cpi.h
	modified:   sdk/bpf/c/inc/sol/inc/cpi.inc
	modified:   sdk/program/src/syscalls/mod.rs
	modified:   sdk/src/transaction/sanitized.rs

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

@mergify mergify bot added conflicts feature-gate Pull Request adds or modifies a runtime feature gate labels Sep 15, 2022
@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 Sep 15, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Sep 15, 2022

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Sep 16, 2022
@jstarry jstarry force-pushed the mergify/bp/v1.14/pr-27242 branch from ecf7b46 to 1bfc78f Compare September 16, 2022 13:57
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Sep 16, 2022
@solana-grimes
Copy link
Contributor

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

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Sep 16, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Sep 16, 2022

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 Sep 16, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Sep 16, 2022

automerge label removed due to a CI failure

@jstarry jstarry added the no-automerge Prevent the automerge label from being applied label Sep 16, 2022
@jstarry jstarry requested a review from brooksprumo September 16, 2022 18:18
Copy link
Contributor

@brooksprumo brooksprumo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@jstarry jstarry merged commit 3bb2d06 into v1.14 Sep 16, 2022
@jstarry jstarry deleted the mergify/bp/v1.14/pr-27242 branch September 16, 2022 20:20
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
conflicts feature-gate Pull Request adds or modifies a runtime feature gate no-automerge Prevent the automerge label from being applied
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants