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

8328812: Update and move siphash license #2635

Closed
wants to merge 1 commit into from

Conversation

luchenlin
Copy link
Contributor

@luchenlin luchenlin commented Mar 29, 2024

I backport this for parity with 11.0.24-oracle.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8328812 needs maintainer approval

Issue

  • JDK-8328812: Update and move siphash license (Bug - P3 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev.git pull/2635/head:pull/2635
$ git checkout pull/2635

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2635

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/2635.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 29, 2024

👋 Welcome back andrewlu! 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 bot commented Mar 29, 2024

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

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

8328812: Update and move siphash license

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 6 new commits pushed to the master branch:

  • 5d4de36: 8286705: GCC 12 reports use-after-free potential bugs
  • 741b340: 8243010: Test support: Customizable Hex Printer
  • 518e797: 8326661: sun/java2d/cmm/ColorConvertOp/ColConvTest.java assumes profiles were generated by LCMS
  • 29a08f7: 8210988: Improved handling of compiler warnings in the build
  • 4117953: 8273831: PrintServiceLookup spawns 2 threads in the current classloader, getting orphaned
  • d98b460: 8317507: C2 compilation fails with "Exceeded _node_regs array"

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 openjdk bot changed the title Backport ce7ebaa606f96fdfee66d300b56022d9903b5ae3 8328812: Update and move siphash license Mar 29, 2024
@openjdk
Copy link

openjdk bot commented Mar 29, 2024

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

@openjdk
Copy link

openjdk bot commented Mar 29, 2024

⚠️ @luchenlin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 29, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 29, 2024

Webrevs

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Mar 29, 2024
@luchenlin
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 1, 2024

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

  • b05024a: 8310380: Handle problems in core-related tests on macOS when codesign tool does not work
  • 0073602: 8297798: Timeout with DTLSOverDatagram test template
  • 979daf5: 8264152: javax/net/ssl/DTLS/RespondToRetransmit.java timed out
  • 5d4de36: 8286705: GCC 12 reports use-after-free potential bugs
  • 741b340: 8243010: Test support: Customizable Hex Printer
  • 518e797: 8326661: sun/java2d/cmm/ColorConvertOp/ColConvTest.java assumes profiles were generated by LCMS
  • 29a08f7: 8210988: Improved handling of compiler warnings in the build
  • 4117953: 8273831: PrintServiceLookup spawns 2 threads in the current classloader, getting orphaned
  • d98b460: 8317507: C2 compilation fails with "Exceeded _node_regs array"

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 1, 2024
@openjdk openjdk bot closed this Apr 1, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 1, 2024
@openjdk
Copy link

openjdk bot commented Apr 1, 2024

@luchenlin Pushed as commit d27c9ba.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
1 participant