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

Remove extra the in SSL_SESSION_set1_id.pod #4969

Closed
wants to merge 1 commit into from
Closed

Remove extra the in SSL_SESSION_set1_id.pod #4969

wants to merge 1 commit into from

Conversation

danbev
Copy link
Contributor

@danbev danbev commented Dec 21, 2017

Checklist
  • documentation is added or updated

@dot-asm dot-asm added 1.1.0 branch: master Merge to master branch approval: review pending This pull request needs review by a committer labels Dec 21, 2017
@dot-asm
Copy link
Contributor

dot-asm commented Dec 21, 2017

I've added 1.1.0 label, because problem is even there. But the file resides in different directory. It's was earlier suggests that cherry-pick could find the way anyway...

@richsalz richsalz self-assigned this Dec 21, 2017
@richsalz
Copy link
Contributor

@dot-asm did you mean to approve this?

@dot-asm
Copy link
Contributor

dot-asm commented Dec 21, 2017

@dot-asm did you mean to approve this?

I thought I did... I mean I recall myself choosing "Approve" in the menu...

@dot-asm dot-asm 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 Dec 21, 2017
levitte pushed a commit that referenced this pull request Dec 22, 2017
@danbev
Remove extra the in SSL_SESSION_set1_id.pod
17b6028 
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from #4969)
@dot-asm dot-asm removed the 1.1.0 label Dec 22, 2017
@dot-asm
Copy link
Contributor

dot-asm commented Dec 22, 2017

Cherry-pick to 1.1.0 didn't work, so I assume that suggestion that git can track renamed files is an urban legend. I suggest not to backport it. Otherwise merged to master. Thanks for report.

@dot-asm dot-asm closed this Dec 22, 2017
@richsalz
Copy link
Contributor

I've seen it track things, but not always. So maybe it's not an urban legend. Or maybe the Yeti did it :)

@davidben
Copy link
Contributor

(git doesn't track renames but heuristically derives the information on demand. It means importing random snapshots as commits is simpler because you don't need to figure when to git mv vs git add, but sometimes it doesn't figure out the renames you want it to.)

@danbev danbev deleted the ssl_session_set1_id_pod_typo branch March 27, 2018 06:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@richsalz richsalz richsalz approved these changes

@dot-asm dot-asm dot-asm approved these changes

Assignees

@richsalz richsalz

Labels
approval: done This pull request has the required number of approvals branch: master Merge to master branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@danbev @dot-asm @richsalz @davidben