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

WriteTimeoutSocket::getFileDescriptor$ support for Conscrypt #505 #507

Merged
merged 5 commits into from
Jan 21, 2021
Merged

WriteTimeoutSocket::getFileDescriptor$ support for Conscrypt #505 #507

merged 5 commits into from
Jan 21, 2021

Conversation

jmehrens
Copy link
Contributor

@jmehrens jmehrens commented Jan 20, 2021 •
edited

Issue #505

@jmehrens jmehrens requested a review from lukasj January 20, 2021 23:19
@jmehrens
Copy link
Contributor Author

jmehrens commented Jan 20, 2021 •
edited

@lukasj This is a candidate for backport. Once this gets the okay I'll create a backport pull request to the 1.x branch. Also I think we should use 'Squash and Merge' option instead of the default 'Merge pull request'

lukasj
lukasj approved these changes Jan 21, 2021
View reviewed changes
Copy link
Contributor

@lukasj lukasj left a comment

Choose a reason for hiding this comment

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

LGTM, just update copyright year in header to 2021. mvn glassfish-copyright-maven-plugin:copyright can tell you what's wrong

@jmehrens jmehrens merged commit db4f348 into jakartaee:master Jan 21, 2021
jmehrens added a commit that referenced this pull request Jan 21, 2021
@jmehrens
WriteTimeoutSocket::getFileDescriptor$ support for Conscrypt #505 (#507)
c6d0168 
WriteTimeoutSocket::getFileDescriptor$ support for Conscrypt #505
(cherry picked from commit db4f348)

Conflicts:
	mail/src/test/java/com/sun/mail/util/WriteTimeoutSocketTest.java
M66B added a commit to M66B/FairEmail that referenced this pull request Feb 8, 2021
@M66B
WriteTimeoutSocket::getFileDescriptor$ support for Conscrypt
dc6747a 
jakartaee/mail-api#507
bvfalcon pushed a commit to bvfalcon/jakarta-mail that referenced this pull request Aug 8, 2022
@jmehrens
WriteTimeoutSocket::getFileDescriptor$ support for Conscrypt jakartae…
ce680b2 
…e#505 (jakartaee#507)

WriteTimeoutSocket::getFileDescriptor$ support for Conscrypt jakartaee#505
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lukasj lukasj lukasj approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jmehrens @lukasj