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

Bumps solana_rbpf to version v0.2.20 (backport #22164) #22207

Merged
merged 1 commit into from
Dec 31, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 31, 2021

This is an automatic backport of pull request #22164 done by Mergify.
Cherry-pick of 8a43e2d has failed:

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

You are currently cherry-picking commit 8a43e2d88.
  (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:   Cargo.lock
	modified:   programs/bpf/Cargo.lock

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cli/Cargo.toml
	both modified:   programs/bpf/Cargo.toml
	both modified:   programs/bpf_loader/Cargo.toml
	both modified:   rbpf-cli/Cargo.toml

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

@Lichtso Lichtso force-pushed the mergify/bp/v1.9/pr-22164 branch from 5ade42e to 22e32a8 Compare December 31, 2021 19:37
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Dec 31, 2021
@Lichtso Lichtso removed the conflicts label Dec 31, 2021
@codecov
Copy link

codecov bot commented Dec 31, 2021

Codecov Report

Merging #22207 (22e32a8) into v1.9 (c6ab915) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             v1.9   #22207   +/-   ##
=======================================
  Coverage    81.1%    81.1%           
=======================================
  Files         518      518           
  Lines      144814   144814           
=======================================
  Hits       117456   117456           
  Misses      27358    27358           

@mergify mergify bot merged commit 70d5b6a into v1.9 Dec 31, 2021
@mergify mergify bot deleted the mergify/bp/v1.9/pr-22164 branch December 31, 2021 21:57
@brooksprumo brooksprumo mentioned this pull request Jan 5, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Apr 3, 2022

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 Apr 3, 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 locked PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant