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

Merge jdk:master #127

Closed
wants to merge 105 commits into from
Closed

Merge jdk:master #127

wants to merge 105 commits into from

Conversation

kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Nov 9, 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) (3/9 running) ✔️ (9/9 passed)

Download

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

erikj79 and others added 30 commits Nov 2, 2020
Reviewed-by: ayang, iwalulya, tschatzl
…ed VMOutOfMemoryException is not thrown

Reviewed-by: cjplummer, sspitsyn, kvn
…levant VM flags are set

Reviewed-by: sgehwolf
Reviewed-by: ihse, never, kvn
coleenp and others added 18 commits Nov 6, 2020
Reviewed-by: redestad, cjplummer, dholmes, stuefe
…escription.java timed out

Reviewed-by: sspitsyn, cjplummer
Reviewed-by: coleenp, gziemski, dholmes
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 9, 2020

👋 Welcome back kcr! 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 openjdk bot commented Nov 9, 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 9, 2020
@kevinrushforth
Copy link
Member Author

@kevinrushforth kevinrushforth commented Nov 9, 2020

I'll merge it in once the GitHub actions build passes.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 9, 2020

@kevinrushforth
Copy link
Member Author

@kevinrushforth kevinrushforth commented Nov 10, 2020

/integrate

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

@openjdk openjdk bot commented Nov 10, 2020

@kevinrushforth Pushed as commit fc9638c.

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
integrated