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

Improve doc of x509 v3 set ctx() #17358

Closed
wants to merge 1 commit into from

Conversation

DDvO
Copy link
Contributor

@DDvO DDvO commented Dec 27, 2021

This has been carved out from #16998
such that these general doc improvements are made available earlier
and potential further merge conflicts are avoided for them.

Checklist
  • documentation is added or updated
  • tests are added or updated

@DDvO DDvO added branch: master Merge to master branch approval: otc review pending This pull request needs review by an OTC member triaged: documentation The issue/pr deals with documentation (errors) labels Dec 27, 2021
@t8m
Copy link
Member

t8m commented Dec 28, 2021

This is not just a doc fix. The first commit should not be in this PR?

@DDvO
Copy link
Contributor Author

DDvO commented Dec 28, 2021

Ah, this was because I had pushed that commit when merging #17212 to the wrong master -
corrected this now, sorry for the confusion. Good you noticed this soon.

@t8m t8m added approval: done This pull request has the required number of approvals and removed approval: otc review pending This pull request needs review by an OTC member labels Dec 28, 2021
@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.

@t8m t8m 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 Dec 29, 2021
@t8m
Copy link
Member

t8m commented Dec 29, 2021

corrected this now, sorry for the confusion

It looks like the correction was somehow incorrect? 😁

@t8m t8m removed the approval: ready to merge The 24 hour grace period has passed, ready to merge label Dec 29, 2021
@DDvO
Copy link
Contributor Author

DDvO commented Dec 29, 2021

Argh, somehow the reference head of this PR went wrong,
and so my yesterday's fix did not help.
What did help was to rebase on the latest upstream/master and force-push.

@DDvO
Copy link
Contributor Author

DDvO commented Dec 30, 2021

@t8m, how about restoring the ready to merge, now this is sorted out?

@t8m t8m added the approval: ready to merge The 24 hour grace period has passed, ready to merge label Jan 3, 2022
@t8m
Copy link
Member

t8m commented Jan 3, 2022

@DDvO restored

@DDvO
Copy link
Contributor Author

DDvO commented Jan 3, 2022

Merged - thanks @t8m for you patience with my branch handling mistake

openssl-machine pushed a commit that referenced this pull request Jan 3, 2022
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #17358)
@paulidale
Copy link
Contributor

Close missed...

@paulidale paulidale closed this Jan 4, 2022
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 triaged: documentation The issue/pr deals with documentation (errors)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants