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 the version to 3.4.0-dev and sync changes from 3.3 branch #24034

Closed
wants to merge 5 commits into from

Conversation

t8m
Copy link
Member

@t8m t8m commented Apr 4, 2024

No description provided.

t8m and others added 5 commits April 4, 2024 10:57
Reviewed-by: Neil Horman <nhorman@openssl.org>
Release: yes
(cherry picked from commit 0ce7d1f)
Reviewed-by: Neil Horman <nhorman@openssl.org>
Release: yes
(cherry picked from commit 3764f20)
@t8m t8m added branch: master Merge to master branch approval: review pending This pull request needs review by a committer approval: otc review pending This pull request needs review by an OTC member triaged: feature The issue/pr requests/adds a feature tests: exempted The PR is exempt from requirements for testing labels Apr 4, 2024
@hlandau hlandau removed the approval: otc review pending This pull request needs review by an OTC member label Apr 4, 2024
@t8m t8m requested a review from levitte April 4, 2024 15:32
OpenSSL.

This release is in development.

OpenSSL 3.3
-----------

### Major changes between OpenSSL 3.2 and OpenSSL 3.3 [under development]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should [under development] be here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, the date will be Apr 17th but it was not released yet. We can sync it later.

Copy link
Member

@slontis slontis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there supposed to be multiple entries in CHANGES.md containing the date string
as [xx XXX xxxx]

@t8m
Copy link
Member Author

t8m commented Apr 5, 2024

Are there supposed to be multiple entries in CHANGES.md containing the date string as [xx XXX xxxx]

I do not think it matters much. We fix it up later once 3.3.0 is released. Or we can delay this PR until that time, that is of course also an option. However some PRs really need to be rebased against this PR as they are adding new API calls and target 3.4 release.

@t8m t8m 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 Apr 8, 2024
@openssl-machine openssl-machine 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 Apr 9, 2024
@openssl-machine
Copy link
Collaborator

This pull request is ready to merge

@t8m
Copy link
Member Author

t8m commented Apr 9, 2024

Merged to the master branch. Thank you for the reviews.

@t8m t8m closed this Apr 9, 2024
openssl-machine pushed a commit that referenced this pull request Apr 9, 2024
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from #24034)
openssl-machine pushed a commit that referenced this pull request Apr 9, 2024
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from #24034)
openssl-machine pushed a commit that referenced this pull request Apr 9, 2024
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from #24034)
openssl-machine pushed a commit that referenced this pull request Apr 9, 2024
Reviewed-by: Neil Horman <nhorman@openssl.org>
Release: yes
(cherry picked from commit 0ce7d1f)

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #24034)
openssl-machine pushed a commit that referenced this pull request Apr 9, 2024
Reviewed-by: Neil Horman <nhorman@openssl.org>
Release: yes
(cherry picked from commit 3764f20)

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #24034)
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 branch: master Merge to master branch tests: exempted The PR is exempt from requirements for testing triaged: feature The issue/pr requests/adds a feature
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

7 participants