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.

Sign up for GitHub

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

Jump to bottom

Fix merge problem in d2i_PrivateKey_ex #14243

Closed
wants to merge 1 commit into from
Closed

Fix merge problem in d2i_PrivateKey_ex #14243

wants to merge 1 commit into from

Conversation

slontis
Copy link
Member

@slontis slontis commented Feb 19, 2021 •
edited
Loading

The decoder rename change got merged after I rebased. Herein is a fix.

I need to stop doing merges at night.

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

@slontis slontis added approval: review pending This pull request needs review by a committer branch: master Merge to master branch severity: urgent Fixes an urgent issue (exempt from 24h grace period) labels Feb 19, 2021
mattcaswell
mattcaswell approved these changes Feb 19, 2021
View reviewed changes
Copy link
Member

@mattcaswell mattcaswell left a comment

Choose a reason for hiding this comment

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

Darn...beat me to it. I was creating the same PR. :-)

@mattcaswell mattcaswell added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: review pending This pull request needs review by a committer labels Feb 19, 2021
@slontis
Copy link
Member Author

slontis commented Feb 19, 2021

Darn...beat me to it. I was creating the same PR. :-)

Apologies.

@mattcaswell mattcaswell mentioned this pull request Feb 19, 2021
Closed
@t8m
Copy link
Member

t8m commented Feb 19, 2021

I did one too 😆

@slontis
Copy link
Member Author

slontis commented Feb 19, 2021

I did one too 😆

Apologies to you also then

@t8m
Copy link
Member

t8m commented Feb 19, 2021

Please merge

openssl-machine pushed a commit that referenced this pull request Feb 19, 2021
@slontis
Fix merge problem in d2i_PrivateKey_ex
3352dc1 
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #14243)
@slontis
Copy link
Member Author

slontis commented Feb 19, 2021

Thanks.. merged to master.

@slontis slontis closed this Feb 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@t8m t8m t8m approved these changes

@mattcaswell mattcaswell mattcaswell approved these changes

Assignees
No one assigned
Labels
approval: ready to merge The 24 hour grace period has passed, ready to merge branch: master Merge to master branch severity: urgent Fixes an urgent issue (exempt from 24h grace period)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@slontis @t8m @mattcaswell