Merge master #75
Merge master #75
Conversation
Reviewed-by: vromero
Reviewed-by: wetmore
…d on MacOS Reviewed-by: kcr, prr
8069116: improve fatal error handling in JavaCompiler Reviewed-by: jjg
…jtreg tests Reviewed-by: psandoz
…interface Reviewed-by: vromero
…of the standard header Reviewed-by: jjg
Reviewed-by: xuelei
|
👋 Welcome back duke! A progress list of the required criteria for merging this PR into |
openjdk
bot
added
merge-conflict
Webrevs
|
…ccording to primitive size Reviewed-by: alanb
Reviewed-by: pbansal
…is inefficient Reviewed-by: jjg
Reviewed-by: kbarrett
Reviewed-by: serb
Reviewed-by: hseigel
…n SATB buffers Reviewed-by: shade
Reviewed-by: kbarrett, stefank
Reviewed-by: serb
Reviewed-by: kvn, sviswanathan
Reviewed-by: kbarrett, ayang, phh
Reviewed-by: wetmore
Reviewed-by: lfoltan, coleenp
…flow Reviewed-by: thartmann, kvn
…impleHttpServer Reviewed-by: dfuchs
…class unloading Reviewed-by: pliden, neliasso
Reviewed-by: hannesw
…found in unbound lookup' when resolving method reference Reviewed-by: mcimadamore
Reviewed-by: mgronlun
…ialFocusTest1.java on Windows Reviewed-by: kizune, pbansal
Reviewed-by: rkennke
…ndCP_JFR.java on Windows Reviewed-by: pliden
…gner’s cert chain Reviewed-by: mullan, weijun, rhalade
Reviewed-by: xliu, kvn, kbarrett
Reviewed-by: prr, serb
…alid_vtable_index) failed: correct sentinel value Reviewed-by: lucy, chagedorn
Reviewed-by: kbarrett, coleenp
Reviewed-by: dfuchs, chegar
…g:os+cpu Reviewed-by: dholmes
Reviewed-by: vlivanov
Reviewed-by: attila, redestad, chegar
…tion requests Reviewed-by: dholmes, coleenp
Reviewed-by: coleenp, lfoltan, shade
Reviewed-by: hannesw
Reviewed-by: hannesw
Reviewed-by: erikj, weijun, mullan
…ngCoding.Result Reviewed-by: rriggs, alanb
Reviewed-by: rkennke, shade
Reviewed-by: psandoz, vlivanov
Reviewed-by: sspitsyn, amenkov
|
@openjdk-bot This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration! |
|
@openjdk-bot This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the |
Hi all,
this is an automatically generated pull request to notify you that there are 10 commits from the branch
masterthat can not be merged into the branchlambda-leftovers: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/amber 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 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
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/amber pull/75/head:pull/75$ git checkout pull/75Update a local copy of the PR:
$ git checkout pull/75$ git pull https://git.openjdk.org/amber pull/75/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 75View PR using the GUI difftool:
$ git pr show -t 75Using diff file
Download this PR as a diff file:
https://git.openjdk.org/amber/pull/75.diff