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

8255264: Support for identifying the full range of IPv4 localhost addresses on Windows #627

Closed
wants to merge 52 commits into from

Conversation

macarte
Copy link
Contributor

@macarte macarte commented Nov 15, 2021

Backport of JDK-8255264


Progress

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

Issue

  • JDK-8255264: Support for identifying the full range of IPv4 localhost addresses on Windows

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 627

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 15, 2021

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

@openjdk openjdk bot changed the title Backport 7e01bc967d00dce1791ef5cd31b8083751eb52e6 8255264: Support for identifying the full range of IPv4 localhost addresses on Windows Nov 15, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 15, 2021

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

@openjdk openjdk bot added backport clean rfr labels Nov 15, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 15, 2021

Webrevs

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Nov 16, 2021

Same here... after you've rebased #626 correctly, rebase this PR's source branch to the source branch of #626. Then we should only see one commit in this PR and everything will look good.

@macarte
Copy link
Contributor Author

@macarte macarte commented Nov 26, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 26, 2021

@macarte This pull request has not yet been marked as ready for integration.

@macarte
Copy link
Contributor Author

@macarte macarte commented Nov 26, 2021

right, have to wait for #626 to be commited first

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/626 to master Nov 26, 2021
@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented Nov 26, 2021

The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout 8250521
git fetch https://git.openjdk.java.net/jdk11u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot removed the clean label Nov 26, 2021
@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Nov 29, 2021

Can you rebase this PR onto current master? Then it should become clean again...

macarte and others added 8 commits Nov 29, 2021
…03/TestDescription.java fails with "Location mismatch" errors

Backport-of: f1553a5
…ation/ComodoCA.java fails due to revoked cert

Backport-of: 4bc9b04
…x86_32

Backport-of: 465d350d0b3cac277a58b9f8ece196c1cde68e80
8275849: TestZoneInfo310.java fails with tzdata2021e

Backport-of: 5b4e39863dbc0d61e91675261dd6887f704ab868
…-8275766

Backport-of: ad3be04d2ac84836e393d696ff03ddfe72779094
Reka Kovacs and others added 15 commits Nov 29, 2021
8272181: Windows-AArch64:Backport fix of `Backtracing broken on PAC enabled systems`

Co-authored-by: Monica Beckwith <mbeckwit@openjdk.org>
Co-authored-by: Ludovic Henry <luhenry@openjdk.org>
Co-authored-by: Bernhard Urban-Forster <burban@openjdk.org>
Reviewed-by: burban, aph, adinn, mbeckwit
Backport-of: 9604ee8
Remove the NSK_STUB macros from code outside of the jvmti subfolder

Backport-of: b20e2cd
Remove the NSK_CPP_STUB macros

Reviewed-by: mdoerr
Backport-of: 61f453e
Backport-of: 3e0d7c33d41a93496bfa6a47d1508e415930adf9
…eserved memory size is too big

Reviewed-by: shade
Backport-of: 735757f
Adding a JNI verification wrapper for tests

Backport-of: b685005
…i/[sS]*

Remove NSK_CPP_STUB macros from the tests

Reviewed-by: mdoerr
Backport-of: e431f6a
Migrate code to using wrapping JNI for exceptions

Backport-of: 7afa700
…narios/[E-M]

Remove the NSK_CPP_STUB macros from tests

Backport-of: d63acb5
…comp -XX:TieredStopAtLevel=1

Modify the test case to handle the scenario's of no printmdo's.

Reviewed-by: phh
Backport-of: 9376dd8
Remove remaining macros

Backport-of: a623db2
@macarte
Copy link
Contributor Author

@macarte macarte commented Nov 29, 2021

/integrate

@openjdk openjdk bot added the clean label Nov 29, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 29, 2021

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

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

8255264: Support for identifying the full range of IPv4 localhost addresses on Windows

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk
Copy link

@openjdk openjdk bot commented Nov 29, 2021

⚠️ @macarte This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@openjdk openjdk bot added ready sponsor labels Nov 29, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 29, 2021

@macarte
Your change (at version ba6adc3) is now ready to be sponsored by a Committer.

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Nov 29, 2021

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Nov 29, 2021

Going to push as commit 5d99c71.

@openjdk openjdk bot closed this Nov 29, 2021
@openjdk openjdk bot added integrated and removed ready rfr sponsor labels Nov 29, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 29, 2021

@RealCLanger @macarte Pushed as commit 5d99c71.

💡 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