[records-2] RFR: Merge master
J.Duke
duke at openjdk.java.net
Thu Oct 15 22:11:40 UTC 2020
Hi all,
this is an _automatically_ generated pull request to notify you that there are 105 commits from the branch `master`that
can **not** be merged into the branch `records-2`:
The following file contains merge conflicts:
- src/hotspot/share/classfile/classFileParser.cpp
All Committers in this [project](https://openjdk.java.net/census#amber) have access to my [personal
fork](https://github.com/openjdk-bot/amber) 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](https://wiki.openjdk.java.net/display/skara#Skara-Personalforks) of the
[openjdk/amber](https://github.com/openjdk/amber) repository.
# Ensure target branch is up to date
$ git checkout records-2
$ git pull https://github.com/openjdk/amber.git records-2
# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/amber.git +65:openjdk-bot-65
$ git checkout openjdk-bot-65
# Merge the target branch
$ git merge records-2
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 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/amber.git openjdk-bot-65:65
_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
-------------
Commit messages:
- 8251325: Miss 'L' for long value in if statement
- 8254192: ExtraSharedClassListFile contains extra white space at end of line
- 8254799: runtime/ErrorHandling/TestHeapDumpOnOutOfMemoryError.java fails with release VMs
- 8254811: JDK-8254158 broke ppc64, s390 builds
- 8249878: jfr_emergency_dump has secondary crashes
- 8254674: G1: Improve root location reference to dead obj verification message
- 8254719: ZGC: Clean up includes
- 8253952: Refine ZipOutputStream.putNextEntry() to recalculate ZipEntry's compressed size
- 8252221: Use multiple workers for Parallel GC pre-touching
- 8254734: "dead loop detected" assert failure with patch from 8223051
- ... and 95 more: https://git.openjdk.java.net/amber/compare/ced46b19...96bb6e76
The webrev contains the conflicts with records-2:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=amber&pr=62&range=00.conflicts
Changes: https://git.openjdk.java.net/amber/pull/62/files
Stats: 316332 lines in 876 files changed: 305537 ins; 5790 del; 5005 mod
Patch: https://git.openjdk.java.net/amber/pull/62.diff
Fetch: git fetch https://git.openjdk.java.net/amber pull/62/head:pull/62
PR: https://git.openjdk.java.net/amber/pull/62
More information about the amber-dev
mailing list