Skip to content
This repository has been archived by the owner. It is now read-only.

Merge jdk:master #123

Closed
wants to merge 147 commits into from
Closed

Merge jdk:master #123

wants to merge 147 commits into from

Conversation

kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Nov 2, 2020

Manual merge of jdk/master into lanai/master since the nightly auto-merge process is still offline (see SKARA-764).


Progress

  • Change must not contain extraneous whitespace

Testing

Linux x64 Linux x86 Windows x64 macOS x64
Build ✔️ (5/5 passed) ✔️ (2/2 passed) ✔️ (2/2 passed) ✔️ (2/2 passed)
Test (tier1) ✔️ (9/9 passed) ✔️ (9/9 passed) ✔️ (9/9 passed) ✔️ (9/9 passed)

Download

$ git fetch https://git.openjdk.java.net/lanai pull/123/head:pull/123
$ git checkout pull/123

cl4es and others added 30 commits Oct 23, 2020
Reviewed-by: neliasso, kvn
…n/JComboBoxPopupLocation.java fails on windows

Reviewed-by: trebari, serb
…rms with "Misaligned access at address: 12"

Co-authored-by: Maurizio Cimadamore <mcimadamore@openjdk.org>
Reviewed-by: mcimadamore
Reviewed-by: psandoz, rrich
Reviewed-by: thartmann, neliasso, kvn
… fails only in MacOSX(10.10)

Reviewed-by: prr
Reviewed-by: asemenyuk, herrick
@kevinrushforth kevinrushforth changed the title Merge jdk 2020 11 02 Merge jdk:master Nov 2, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Nov 2, 2020

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

Merge jdk:master

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.

@openjdk openjdk bot added ready rfr labels Nov 2, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 2, 2020

rkennke and others added 18 commits Nov 2, 2020
Reviewed-by: tbell, ihse
Reviewed-by: eosterlund, pliden
Reviewed-by: iignatyev, vlivanov, iveresov, ihse
Co-authored-by: Albert Mingkun Yang <ayang@openjdk.org>
Co-authored-by: Per Liden <pliden@openjdk.org>
Reviewed-by: ayang, eosterlund
…instead of JVMTI_FUNC_PTR

Reviewed-by: sspitsyn, amenkov
@kevinrushforth
Copy link
Member Author

@kevinrushforth kevinrushforth commented Nov 3, 2020

/integrate

@openjdk openjdk bot closed this Nov 3, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Nov 3, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Nov 3, 2020

@kevinrushforth Pushed as commit fea7abd.

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

@kevinrushforth kevinrushforth deleted the merge-jdk-2020-11-02 branch Dec 2, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
integrated