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

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

Merged
mergify[bot] merged 2 commits into
v1.13from
mergify/bp/v1.13/pr-27242
Sep 16, 2022
Merged

Increase transaction account lock limit from 64 to 128 (backport #27242)#27809
mergify[bot] merged 2 commits into
v1.13from
mergify/bp/v1.13/pr-27242

Conversation

@mergify
Copy link
Copy Markdown
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.13/pr-27242
Your branch is up to date with 'origin/v1.13'.

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:   sdk/src/transaction/sanitized.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   programs/bpf/tests/programs.rs
	deleted by us:   programs/bpf_loader/src/syscalls/cpi.rs
	both modified:   runtime/src/bank.rs
	both modified:   sdk/bpf/c/inc/sol/cpi.h
	deleted by us:   sdk/bpf/c/inc/sol/inc/cpi.inc
	deleted by us:   sdk/program/src/syscalls/mod.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 the automerge Merge this Pull Request automatically once CI passes label Sep 15, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Sep 15, 2022

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Sep 15, 2022
@jstarry jstarry force-pushed the mergify/bp/v1.13/pr-27242 branch from d9ee5b8 to 9e459f0 Compare September 16, 2022 12:26
@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.13/pr-27242 branch from 9e459f0 to 47bfa33 Compare September 16, 2022 13:16
@solana-grimes
Copy link
Copy Markdown
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 Sep 16, 2022
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Sep 16, 2022
@mergify
Copy link
Copy Markdown
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 mergify Bot merged commit 2659fd8 into v1.13 Sep 16, 2022
@mergify mergify Bot deleted the mergify/bp/v1.13/pr-27242 branch September 16, 2022 18:08
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 feature-gate Pull Request adds or modifies a runtime feature gate

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants