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

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 14, 2023

This is an automatic backport of pull request #34447 done by Mergify.
Cherry-pick of 47dab26 has failed:

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

You are currently cherry-picking commit 47dab26857.
  (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:   runtime/src/bank.rs

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

(cherry picked from commit 47dab26)

# Conflicts:
#	program-runtime/src/loaded_programs.rs
@mergify mergify bot added the conflicts label Dec 14, 2023
@pgarg66 pgarg66 requested a review from Lichtso December 14, 2023 14:10
@Lichtso Lichtso removed the conflicts label Dec 14, 2023
@codecov
Copy link

codecov bot commented Dec 14, 2023

Codecov Report

Merging #34460 (b77c25d) into v1.17 (4d131b0) will decrease coverage by 0.1%.
The diff coverage is 94.4%.

Additional details and impacted files
@@            Coverage Diff            @@
##            v1.17   #34460     +/-   ##
=========================================
- Coverage    81.8%    81.8%   -0.1%     
=========================================
  Files         803      803             
  Lines      218167   218171      +4     
=========================================
- Hits       178510   178501      -9     
- Misses      39657    39670     +13     

@pgarg66 pgarg66 merged commit ca34005 into v1.17 Dec 14, 2023
@pgarg66 pgarg66 deleted the mergify/bp/v1.17/pr-34447 branch December 14, 2023 15:15
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants