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 Feb 22, 2022

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

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

You are currently cherry-picking commit bcda74f42.
  (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/builtin_programs.rs
	modified:   runtime/src/builtins.rs
	modified:   sdk/src/feature_set.rs

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

# Conflicts:
#	runtime/src/bank.rs
#	runtime/src/genesis_utils.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Feb 22, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Feb 22, 2022

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Feb 22, 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 Feb 22, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Feb 22, 2022

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Feb 22, 2022
@mergify mergify bot merged commit 215c708 into v1.9 Feb 22, 2022
@mergify mergify bot deleted the mergify/bp/v1.9/pr-23256 branch February 22, 2022 16:15
@codecov
Copy link

codecov bot commented Feb 22, 2022

Codecov Report

Merging #23273 (41221b3) into v1.9 (c02c73f) will increase coverage by 0.0%.
The diff coverage is 97.7%.

@@           Coverage Diff           @@
##             v1.9   #23273   +/-   ##
=======================================
  Coverage    81.6%    81.7%           
=======================================
  Files         530      530           
  Lines      147954   147983   +29     
=======================================
+ Hits       120877   120911   +34     
+ Misses      27077    27072    -5     

@github-actions
Copy link
Contributor

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 Mar 30, 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