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

Feature/quic server branch rebase #25935

Closed
wants to merge 149 commits into from
Closed

Conversation

t8m
Copy link
Member

@t8m t8m commented Nov 12, 2024

Please review the fixup commits as they solve conflicts

@t8m t8m added approval: review pending This pull request needs review by a committer triaged: feature The issue/pr requests/adds a feature tests: exempted The PR is exempt from requirements for testing labels Nov 12, 2024
@mattcaswell
Copy link
Member

Hmmm. There are CI failures. Should we worry about that during the rebase?

@t8m
Copy link
Member Author

t8m commented Nov 12, 2024

Hmmm. There are CI failures. Should we worry about that during the rebase?

Definitely. I'm looking at them

@t8m t8m added the style: waived exempted from style checks label Nov 12, 2024
@mattcaswell mattcaswell mentioned this pull request Nov 12, 2024
@nhorman
Copy link
Contributor

nhorman commented Nov 12, 2024

so, I think thats an artifact of how I created this PR. I did it mostly as an exercise to figure out how to do a rebase review. Currently the PR is requesting a merge from my rebased branch to the feature/quic-server branch, which would definately break things all over the place. I wasn't sure how to properly open the PR as theres no way to indicate that this is going to be a force push to the quic-server branch

@github-actions github-actions bot added the severity: ABI change This pull request contains ABI changes label Nov 12, 2024
@nhorman nhorman linked an issue Nov 12, 2024 that may be closed by this pull request
@nhorman
Copy link
Contributor

nhorman commented Nov 12, 2024

all the fixups match the ones I made in my branch

nhorman
nhorman previously approved these changes Nov 12, 2024
@t8m t8m requested a review from mattcaswell November 12, 2024 18:09
mattcaswell
mattcaswell previously approved these changes Nov 13, 2024
@mattcaswell mattcaswell added approval: done This pull request has the required number of approvals and removed approval: review pending This pull request needs review by a committer labels Nov 13, 2024
@openssl-machine
Copy link
Collaborator

24 hours has passed since 'approval: done' was set, but this PR has failing CI tests. Once the tests pass it will get moved to 'approval: ready to merge' automatically,alternatively please review and set the label manually.

@mattcaswell
Copy link
Member

It seems there is a conflict

@t8m
Copy link
Member Author

t8m commented Nov 14, 2024

It seems there is a conflict

This is a trivial conflict to resolve, IMO no need to re-review. I am going to rebase the branch again, force push and if CI passes, I will push the rebased branch to the primary repo.

Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#21795)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#21795)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#21795)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#21795)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#21795)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#21795)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#21795)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#21795)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#21795)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Neil Horman <[email protected]>
(Merged from openssl#23334)
hlandau and others added 23 commits November 14, 2024 16:37
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Saša Nedvědický <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#25416)
…r inter-thread notification

Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Saša Nedvědický <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#25416)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Saša Nedvědický <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#25416)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Saša Nedvědický <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#25416)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Saša Nedvědický <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#25416)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Saša Nedvědický <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#25416)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Saša Nedvědický <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#25416)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Saša Nedvědický <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#25416)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Saša Nedvědický <[email protected]>
(Merged from openssl#25416)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Saša Nedvědický <[email protected]>
(Merged from openssl#25416)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Saša Nedvědický <[email protected]>
(Merged from openssl#25416)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Saša Nedvědický <[email protected]>
(Merged from openssl#25416)
…ic()

Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Saša Nedvědický <[email protected]>
(Merged from openssl#25416)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Saša Nedvědický <[email protected]>
(Merged from openssl#25416)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Saša Nedvědický <[email protected]>
(Merged from openssl#25416)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#25532)
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#25532)
Reviewed-by: Saša Nedvědický <[email protected]>
Reviewed-by: Matt Caswell <[email protected]>
(Merged from openssl#25834)
@t8m t8m dismissed stale reviews from mattcaswell and nhorman via 412d736 November 14, 2024 15:40
@mattcaswell mattcaswell added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: done This pull request has the required number of approvals labels Nov 15, 2024
@t8m
Copy link
Member Author

t8m commented Nov 15, 2024

The branch was rebased yesterday. I've just forgot to close this. Closing now.

@t8m t8m closed this Nov 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approval: ready to merge The 24 hour grace period has passed, ready to merge severity: ABI change This pull request contains ABI changes style: waived exempted from style checks tests: exempted The PR is exempt from requirements for testing triaged: feature The issue/pr requests/adds a feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

quic feature branch rebase
8 participants