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

8331864: Update Public Suffix List to 1cbd6e7 #957

Closed

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Sep 6, 2024

I backport this for parity with 21.0.6-oracle.


Progress

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

Issue

  • JDK-8331864: Update Public Suffix List to 1cbd6e7 (Enhancement - P3 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 957

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 6, 2024

👋 Welcome back goetz! 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 Sep 6, 2024

@GoeLin 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:

8331864: Update Public Suffix List to 1cbd6e7

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 1 new commit pushed to the master branch:

  • b0cd38b: 8337331: crash: pinned virtual thread will lead to jvm crash when running with the javaagent option

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 b91083341aba952befadd79020079920f9540999 8331864: Update Public Suffix List to 1cbd6e7 Sep 6, 2024
@openjdk
Copy link

openjdk bot commented Sep 6, 2024

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

@openjdk
Copy link

openjdk bot commented Sep 6, 2024

⚠️ @GoeLin 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 Sep 6, 2024
@mlbridge
Copy link

mlbridge bot commented Sep 6, 2024

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Sep 8, 2024

GHA failure: Well known issue with https://wiki.openjdk.org/display/JDKUpdates/How+to+contribute+or+backport+a+fix. Unrelated.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Sep 8, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Sep 10, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Sep 10, 2024

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

  • c66ea3d: 8328723: IP Address error when client enables HTTPS endpoint check on server socket
  • fbdaf08: 8336413: gtk headers : Fix typedef redeclaration of GMainContext and GdkPixbuf
  • d71aa19: 8326611: Clean up vmTestbase/nsk/stress/stack tests
  • b0cd38b: 8337331: crash: pinned virtual thread will lead to jvm crash when running with the javaagent option

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 10, 2024

@GoeLin Pushed as commit 40fe61a.

💡 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
Development

Successfully merging this pull request may close these issues.

1 participant