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

8273671: Backport of 8260616 misses one JNF header inclusion removal #336

Closed
wants to merge 1 commit into from

Conversation

@VladimirKempik
Copy link

@VladimirKempik VladimirKempik commented Sep 13, 2021

Not a backport. An issue with original backport, may break compilation with some Xcode versions

original 8260616 fix had this openjdk/jdk@8760688#diff-8c13a160c4456c38e9d0f01847b3e506df9e88ddf2e539400cc2f6ae1044e47fL27


Progress

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

Issue

  • JDK-8273671: Backport of 8260616 misses one JNF header inclusion removal ⚠️ Issue is not open.

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 336

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 13, 2021

👋 Welcome back vkempik! 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 added the rfr label Sep 13, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 13, 2021

Webrevs

Loading

@VladimirKempik
Copy link
Author

@VladimirKempik VladimirKempik commented Sep 13, 2021

GHA tests failure are false positive as this PR changes only code to be compiled on macos, not linux or windows (which failed with tests/build)

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Sep 13, 2021

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

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

8273671: Backport of 8260616 misses one JNF header inclusion removal

Reviewed-by: phh

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

@openjdk openjdk bot added the ready label Sep 13, 2021
@VladimirKempik
Copy link
Author

@VladimirKempik VladimirKempik commented Sep 14, 2021

/integrate

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Sep 14, 2021

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

  • 59f0ea3: 8213301: Fix legal headers in jdk logging tests
  • dc43ace: 8213328: Update test copyrights in test/java/util/zip and test/jdk/tools
  • 1d09112: 8213306: Fix legal headers in test/java/nio
  • 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

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

@VladimirKempik Pushed as commit 977ca31.

💡 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