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

Bump to rbpf v0.1.34 (bp #13874) #13878

Merged
merged 2 commits into from
Dec 1, 2020
Merged

Bump to rbpf v0.1.34 (bp #13874) #13878

merged 2 commits into from
Dec 1, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 1, 2020

This is an automated backport of pull request #13874 done by Mergify

Cherry-pick of 7890957 has failed:

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

You are currently cherry-picking commit 789095725.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   Cargo.lock
	both modified:   cli/Cargo.toml
	both modified:   programs/bpf/Cargo.toml
	both modified:   programs/bpf_loader/Cargo.toml

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

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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.io/

(cherry picked from commit 7890957)

# Conflicts:
#	Cargo.lock
#	cli/Cargo.toml
#	programs/bpf/Cargo.toml
#	programs/bpf_loader/Cargo.toml
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Dec 1, 2020
@mergify
Copy link
Contributor Author

mergify bot commented Dec 1, 2020

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Dec 1, 2020
@codecov
Copy link

codecov bot commented Dec 1, 2020

Codecov Report

Merging #13878 (6fe1008) into v1.3 (141d6d1) will increase coverage by 0.0%.
The diff coverage is n/a.

@@          Coverage Diff           @@
##            v1.3   #13878   +/-   ##
======================================
  Coverage   82.5%    82.5%           
======================================
  Files        368      368           
  Lines      88170    88170           
======================================
+ Hits       72749    72753    +4     
+ Misses     15421    15417    -4     

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Dec 1, 2020
@mergify mergify bot merged commit 3318772 into v1.3 Dec 1, 2020
@mergify mergify bot deleted the mergify/bp/v1.3/pr-13874 branch December 1, 2020 08:14
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant