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

v2.1: update quinn-proto to 0.11.9 (backport of #3643) #3672

Merged
merged 2 commits into from
Nov 22, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 15, 2024

Problem

Updated Quinn-proto to 0.11.9 to take advantage of some new enhancements

Summary of Changes

Updated cargo.toml to use Quinn-proto 0.11.9

Fixes #


This is an automatic backport of pull request #3643 done by [Mergify](https://mergify.com).

@mergify mergify bot requested a review from a team as a code owner November 15, 2024 18:27
@mergify mergify bot added the conflicts label Nov 15, 2024
Copy link
Author

mergify bot commented Nov 15, 2024

Cherry-pick of 2c6e41c has failed:

On branch mergify/bp/v2.1/pr-3643
Your branch is up to date with 'origin/v2.1'.

You are currently cherry-picking commit 2c6e41cc36.
  (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)

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

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

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@t-nelson
Copy link

@lijunwangs do we need this?

@lijunwangs lijunwangs force-pushed the mergify/bp/v2.1/pr-3643 branch from 67aecbb to 497428d Compare November 19, 2024 23:06
(cherry picked from commit 2c6e41c)

# Conflicts:
#	Cargo.toml
@alessandrod alessandrod merged commit f0e17c6 into v2.1 Nov 22, 2024
28 checks passed
@alessandrod alessandrod deleted the mergify/bp/v2.1/pr-3643 branch November 22, 2024 11:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants