Merge jdk:master #140
Merge jdk:master #140
Conversation
Reviewed-by: cjplummer, sspitsyn, phh
Reviewed-by: dholmes
…cided on incompatible initial and minimum heap sizes Reviewed-by: tschatzl, sjohanss
…re complete Reviewed-by: chegar, rriggs
…verification Reviewed-by: thartmann, neliasso
…ng in GET_BODY" Reviewed-by: michaelm
Reviewed-by: tschatzl, stefank
… and not abstract Reviewed-by: mchung, darcy
… a offset-computing method handle Reviewed-by: mcimadamore, chegar
… disabled Reviewed-by: mgronlun
Co-authored-by: Vicente Romero <vromero@openjdk.org> Co-authored-by: Harold Seigel <hseigel@openjdk.org> Reviewed-by: lfoltan, mchung, alanb, mcimadamore, chegar
Reviewed-by: jiefu, kbarrett
…ngly marked oops Reviewed-by: shade, rkennke
Reviewed-by: goetz
…amond Reviewed-by: mcimadamore
Reviewed-by: redestad
Reviewed-by: erikj, jvernee, burban
Reviewed-by: shade
…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
…ak-LRB Reviewed-by: rkennke
Reviewed-by: kvn
Reviewed-by: redestad, thartmann
Reviewed-by: jjg
Reviewed-by: redestad, kvn
… signal Reviewed-by: ihse, alanb, dcubed, erikj
Reviewed-by: kvn, neliasso, thartmann
…ails on x86_32 Reviewed-by: kvn
Reviewed-by: jnimeh
Reviewed-by: mgronlun
|
|
openjdk
bot
added
merge-conflict
Webrevs
|
|
@openjdk-bot This change now passes all automated pre-integration checks. After integration, the commit message for the final commit will be: 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 As you do not have Committer status in this project an existing Committer must agree to sponsor your change.
|
openjdk
bot
added
ready
|
/integrate |
|
@openjdk-bot |
|
/sponsor |
openjdk
bot
added
integrated
|
@kevinrushforth @openjdk-bot Pushed as commit 0854159. |
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 branchmaster:The following file contains merge conflicts:
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.
When you have resolved the conflicts resulting from the
git mergecommand 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:
Note: if you are using SSH to push commits to GitHub, then change the URL in the above
git pushcommand accordingly.Thanks,
J. Duke
Progress
Download
$ git fetch https://git.openjdk.java.net/lanai pull/140/head:pull/140$ git checkout pull/140