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

Merge jdk16 #2040

Closed
wants to merge 7 commits into from
Closed

Merge jdk16 #2040

wants to merge 7 commits into from

Conversation

@JesperIRL
Copy link
Member

@JesperIRL JesperIRL commented Jan 11, 2021

Forwardport JDK 16 -> JDK 17


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2040/head:pull/2040
$ git checkout pull/2040

Michael-Mc-Mahon and others added 6 commits Jan 8, 2021
…tChannel.bind(UnixDomainSocketAddress) will have unknown user and group owner (win)

Reviewed-by: alanb
Co-authored-by: Matthias Klose <doko@openjdk.org>
Reviewed-by: erikj
… FileChannel impl

Reviewed-by: chegar, alanb, uschindler
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jan 11, 2021

👋 Welcome back jwilhelm! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

@openjdk openjdk bot commented Jan 11, 2021

@JesperIRL This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

Merge

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 5 new commits pushed to the master branch:

  • b6d51e1: 8259585: Accessible actions do not work on mac os x
  • 022bc9f: 8258422: Cleanup unnecessary null comparison before instanceof check in java.base
  • ff54b77: 8259439: Apply java.io.Serial annotations in java.datatransfer
  • 712ea25: 8258925: configure script failed on WSL
  • cd73939: 8259528: Broken Link for [java.text.Normalizer.Form]

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk
Copy link

@openjdk openjdk bot commented Jan 11, 2021

@JesperIRL The following labels will be automatically applied to this pull request:

  • build
  • compiler
  • core-libs
  • javadoc
  • nio

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 11, 2021

@JesperIRL
Copy link
Member Author

@JesperIRL JesperIRL commented Jan 12, 2021

/integrate

@openjdk openjdk bot closed this Jan 12, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Jan 12, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jan 12, 2021

@JesperIRL Since your change was applied there have been 5 commits pushed to the master branch:

  • b6d51e1: 8259585: Accessible actions do not work on mac os x
  • 022bc9f: 8258422: Cleanup unnecessary null comparison before instanceof check in java.base
  • ff54b77: 8259439: Apply java.io.Serial annotations in java.datatransfer
  • 712ea25: 8258925: configure script failed on WSL
  • cd73939: 8259528: Broken Link for [java.text.Normalizer.Form]

Your commit was automatically rebased without conflicts.

Pushed as commit b378f54.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@JesperIRL JesperIRL deleted the JesperIRL:forward_port_16_17 branch Jan 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
6 participants