Merge master #65
Merged
Merge master #65
+10,762
−6,223
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Reviewed-by: bchristi, joehw
Reviewed-by: kizune
Reviewed-by: shade
…shes on AVX512 machines Reviewed-by: psandoz, sviswanathan, jbhateja
…resolution Reviewed-by: erikj, clanger
Reviewed-by: shade, kvn
Reviewed-by: shade
Reviewed-by: kvn, iklam
… in hotspot Reviewed-by: neliasso, kvn
Reviewed-by: sjohanss, kbarrett, ayang
Reviewed-by: kvn, shade
Reviewed-by: egahlin, dholmes
Reviewed-by: mcimadamore, vromero
Reviewed-by: adinn, vkempik
Reviewed-by: erikj, naoto
Reviewed-by: clanger, rrich
…terpret node Reviewed-by: lucy
Reviewed-by: shade
Co-authored-by: Yanhong Zhu <zhuyanhong2@huawei.com> Reviewed-by: adinn
…ypes Reviewed-by: iklam, coleenp
Reviewed-by: neliasso, kvn
Reviewed-by: almatvee, herrick
Reviewed-by: stuefe
Reviewed-by: dfuchs
…table Reviewed-by: serb, prr
…n/JComboBoxPopupLocation.java fails on windows Reviewed-by: trebari, serb
…opControl.java Reviewed-by: alanb
Reviewed-by: bchristi
Reviewed-by: prr
…java is unstable Reviewed-by: prr
…) for 'uu'/'yy' Reviewed-by: lancea, rriggs
Reviewed-by: erikj
Reviewed-by: ecaspole, erikj
Reviewed-by: kvn
… for code-gen Reviewed-by: kvn, vlivanov, azeemj
…d-safe manner Reviewed-by: chegar, ryadav, dfuchs
…acos Reviewed-by: serb
Reviewed-by: dholmes, gziemski
Reviewed-by: shade, ayang, kbarrett
Reviewed-by: dfuchs, alanb
…chmark Reviewed-by: redestad, shade
Reviewed-by: eosterlund, zgu
…ore thread right after VM call on x86_32 Reviewed-by: dholmes, shade
Reviewed-by: shade
…ocessing Co-authored-by: Richard Reingruber <rrich@openjdk.org> Reviewed-by: rrich, sspitsyn
…incorrect Reviewed-by: kvn, eosterlund
Reviewed-by: ayang, kbarrett
…evel add more method-level options for -XX:CompileCommand eg. -XX:CompileCommand=option,java.lang.String::startsWith,BreakAtCompile directs JIT compilers to hit BREAKPOINT when they compile the method java.lang.String::startsWith. Reviewed-by: neliasso, azeemj, phh
…ents Reviewed-by: chegar, mchung
…va.net.BindException: Cannot assign requested address: connect Reviewed-by: dfuchs, michaelm
…om a split package Reviewed-by: rriggs
|
👋 Welcome back duke! A progress list of the required criteria for merging this PR into |
openjdk
bot
added
merge-conflict
Webrevs
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi all,
this is an automatically generated pull request to notify you that there are 110 commits from the branch
masterthat can not be merged into the branchrecords-2:Over 19 files 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
Error
Merge, but:Merge masterTesting
Download
$ git fetch https://git.openjdk.java.net/amber pull/65/head:pull/65$ git checkout pull/65