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

Merge jdk:master #140

Closed
wants to merge 33 commits into from
Closed

Merge jdk:master #140

wants to merge 33 commits into from

Conversation

openjdk-bot
Copy link

@openjdk-bot openjdk-bot commented Dec 8, 2020

Hi all,

this is an automatically generated pull request to notify you that there are 32 commits from the branch jdk:masterthat can not be merged into the branch master:

The following file contains merge conflicts:

  • make/autoconf/toolchain.m4

All Committers in this project have access to my personal fork and can therefore help resolve these merge conflicts (you may want to coordinate who should do this).
The following paragraphs will give an example on how to solve these merge conflicts and push the resulting merge commit to this pull request.
The below commands should be run in a local clone of your personal fork of the openjdk/lanai repository.

# Ensure target branch is up to date
$ git checkout master
$ git pull https://github.com/openjdk/lanai.git master

# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/lanai.git +6:openjdk-bot-6
$ git checkout openjdk-bot-6

# Merge the target branch
$ git merge master

When you have resolved the conflicts resulting from the git merge command above, run the following commands to create a merge commit:

$ git add paths/to/files/with/conflicts
$ git commit -m 'Merge jdk:master'

When you have created the merge commit, run the following command to push the merge commit to this pull request:

$ git push https://github.com/openjdk-bot/lanai.git openjdk-bot-6:6

Note: if you are using SSH to push commits to GitHub, then change the URL in the above git push command accordingly.

Thanks,
J. Duke


Progress

  • Change must not contain extraneous whitespace

Download

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

Lin Zang and others added 30 commits Dec 7, 2020
…cided on incompatible initial and minimum heap sizes

Reviewed-by: tschatzl, sjohanss
…verification

Reviewed-by: thartmann, neliasso
Reviewed-by: tschatzl, stefank
… and not abstract

Reviewed-by: mchung, darcy
… a offset-computing method handle

Reviewed-by: mcimadamore, chegar
Co-authored-by: Vicente Romero <vromero@openjdk.org>
Co-authored-by: Harold Seigel <hseigel@openjdk.org>
Reviewed-by: lfoltan, mchung, alanb, mcimadamore, chegar
…ngly marked oops

Reviewed-by: shade, rkennke
…args record component

Reviewed-by: mcimadamore
…in size computation for heap segments

Reviewed-by: jvernee, chegar
Reviewed-by: asemenyuk, almatvee, shade
…n.wxl resource

Reviewed-by: herrick, naoto, asemenyuk
Reviewed-by: redestad, thartmann
… signal

Reviewed-by: ihse, alanb, dcubed, erikj
@openjdk openjdk bot added the failed-auto-merge label Dec 8, 2020
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 8, 2020

👋 Welcome back duke! 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 openjdk bot added merge-conflict rfr labels Dec 8, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 8, 2020

@openjdk
Copy link

@openjdk openjdk bot commented Dec 8, 2020

@openjdk-bot 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.

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 openjdk bot added ready and removed merge-conflict labels Dec 8, 2020
@openjdk-bot
Copy link
Author

@openjdk-bot openjdk-bot commented Dec 8, 2020

/integrate

@openjdk openjdk bot added the sponsor label Dec 8, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Dec 8, 2020

@openjdk-bot
Your change (at version 0857084) is now ready to be sponsored by a Committer.

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Dec 8, 2020

/sponsor

@openjdk openjdk bot closed this Dec 8, 2020
@openjdk openjdk bot added integrated and removed sponsor ready rfr labels Dec 8, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Dec 8, 2020

@kevinrushforth @openjdk-bot Pushed as commit 0854159.

💡 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
failed-auto-merge integrated