Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update http crate in bpf program workspace to fix security vulnerability (bp #7735) #7742

Merged
merged 3 commits into from Jan 10, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 10, 2020

This is an automated backport of pull request #7735 done by Mergify.io

Cherry-pick of e90a317 has failed:

On branch mergify/bp/v0.21/pr-7735
Your branch is up to date with 'origin/v0.21'.

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

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 [documention](https://doc.mergify.io/).

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
  • @Mergifyio backports <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 simulator.

Finally, you can contact us on https://mergify.io/

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 10, 2020
@solana-grimes
Copy link
Collaborator

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jan 10, 2020
@codecov
Copy link

codecov bot commented Jan 10, 2020

Codecov Report

Merging #7742 into v0.21 will decrease coverage by 2.4%.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           v0.21   #7742     +/-   ##
=======================================
- Coverage   59.4%   56.9%   -2.5%     
=======================================
  Files        239     239             
  Lines      62407   65100   +2693     
=======================================
+ Hits       37076   37083      +7     
- Misses     25331   28017   +2686

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 10, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jan 10, 2020
@solana-grimes
Copy link
Collaborator

💔 Unable to automerge due to CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 10, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jan 10, 2020
@solana-grimes
Copy link
Collaborator

💔 Unable to automerge due to CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 10, 2020
@solana-grimes solana-grimes merged commit 633e820 into v0.21 Jan 10, 2020
@mergify mergify bot deleted the mergify/bp/v0.21/pr-7735 branch January 10, 2020 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants