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

v1.16: Prevent delay_visibility_of_program_deployment feature from cache pruning (backport of #33689) #33690

Merged
merged 2 commits into from
Oct 13, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 13, 2023

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

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

You are currently cherry-picking commit fd9297775a.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/bank.rs

no changes added to commit (use "git add" and/or "git commit -a")

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

…ning (#33689)

(cherry picked from commit fd92977)

# Conflicts:
#	runtime/src/bank.rs
@mergify mergify bot added the conflicts label Oct 13, 2023
@pgarg66 pgarg66 added automerge Merge this Pull Request automatically once CI passes and removed conflicts labels Oct 13, 2023
@pgarg66 pgarg66 requested a review from Lichtso October 13, 2023 14:43
@mergify mergify bot merged commit fdb432d into v1.16 Oct 13, 2023
@mergify mergify bot deleted the mergify/bp/v1.16/pr-33689 branch October 13, 2023 15:33
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants