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

8213306: Fix legal headers in test/java/nio #329

Closed

Conversation

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Sep 11, 2021

Hi all,

this pull request contains a backport of JDK-8213306 from the openjdk/jdk repository.

The commit being backported was authored by Brian Burkhalter on 2 Nov 2018 and was reviewed by Chris Hegarty.

Thanks!


Progress

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

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/329/head:pull/329
$ git checkout pull/329

Update a local copy of the PR:
$ git checkout pull/329
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/329/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 329

View PR using the GUI difftool:
$ git pr show -t 329

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/329.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 11, 2021

👋 Welcome back clanger! 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.

Loading

@openjdk openjdk bot changed the title Backport 36ca4f5893a7f646205a558124fee2dd50a5abd5 8213306: Fix legal headers in test/java/nio Sep 11, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 11, 2021

This backport pull request has now been updated with issue from the original commit.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Sep 11, 2021

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

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

8213306: Fix legal headers in test/java/nio

Reviewed-by: stuefe

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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.

Loading

@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 11, 2021

Webrevs

Loading

Copy link
Member

@tstuefe tstuefe left a comment

+1

Update: wait, now I start having doubts. Should we even backport copyright changes?

Loading

@RealCLanger
Copy link
Contributor Author

@RealCLanger RealCLanger commented Sep 12, 2021

+1

Update: wait, now I start having doubts. Should we even backport copyright changes?

Yes, that does no harm, there is no risk. I prefer to have parity to Oracle, where possible. (And thanks for the review 😄 )

Loading

@RealCLanger
Copy link
Contributor Author

@RealCLanger RealCLanger commented Sep 14, 2021

/integrate

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Sep 14, 2021

Going to push as commit 1d09112.
Since your change was applied there have been 6 commits pushed to the master branch:

  • 97d37b8: 8213305: Fix legal headers in test/java/math
  • 77bbf1e: 8213296: Fix legal headers in test/jdk/java/net
  • 124f3ac: 8211227: Inconsistent TLS protocol version in debug output
  • 74eed68: 8228442: DHKeyExchange/LegacyDHEKeyExchange.java failed due to "SSLException: An established connection was aborted by the software in your host machine"
  • 4af62d8: 8250863: Build error with GCC 10 in NetworkInterface.c and k_standard.c
  • 1868c15: 8237354: Add option to jcmd to write a gzipped heap dump

Your commit was automatically rebased without conflicts.

Loading

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

@openjdk openjdk bot commented Sep 14, 2021

@RealCLanger Pushed as commit 1d09112.

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

Loading

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants