Skip to content

Un-hide force_key_update / initiate_key_update#2101

Merged
djc merged 2 commits into
quinn-rs:mainfrom
gretchenfrage:force-key-update-public
Dec 21, 2024
Merged

Un-hide force_key_update / initiate_key_update#2101
djc merged 2 commits into
quinn-rs:mainfrom
gretchenfrage:force-key-update-public

Conversation

@gretchenfrage

@gretchenfrage gretchenfrage commented Dec 20, 2024

Copy link
Copy Markdown
Collaborator

See #2097.

Note: initiate_key_update (the one in proto) is called from various places internally, which is the primary reason for differences in their names and comment.

Comment thread quinn-proto/src/connection/mod.rs Outdated
Comment thread quinn-proto/src/connection/mod.rs Outdated
@gretchenfrage gretchenfrage force-pushed the force-key-update-public branch 3 times, most recently from f38139d to ac50dfe Compare December 20, 2024 20:11
@djc djc enabled auto-merge December 20, 2024 20:20
@djc

djc commented Dec 20, 2024

Copy link
Copy Markdown
Member

Hmm, CI seems stuck on this one? Maybe rebase?

@gretchenfrage

Copy link
Copy Markdown
Collaborator Author

Hmm, CI seems stuck on this one? Maybe rebase?

Nothing to rebase over ATM.

[phoenix@leliel:~/repos/h3stuff/quinn]$ git fetch upstream main
git From github.com:quinn-rs/quinn
 * branch              main       -> FETCH_HEAD

[phoenix@leliel:~/repos/h3stuff/quinn]$ git rebase upstream/main
Current branch force-key-update-public is up to date.

[phoenix@leliel:~/repos/h3stuff/quinn]$ git push --force origin force-key-update-public
Everything up-to-date

auto-merge was automatically disabled December 20, 2024 20:42

Head branch was pushed to by a user without write access

@gretchenfrage gretchenfrage force-pushed the force-key-update-public branch from ac50dfe to 09ddf56 Compare December 20, 2024 20:42
@djc djc enabled auto-merge December 20, 2024 21:15
@djc djc added this pull request to the merge queue Dec 20, 2024
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to no response for status checks Dec 20, 2024
@djc djc added this pull request to the merge queue Dec 21, 2024
Merged via the queue into quinn-rs:main with commit e7b5c6c Dec 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants