RFR: Merge jdk:master
duke at openjdk.java.net
Thu Feb 4 03:05:13 UTC 2021
this is an _automatically_ generated pull request to notify you that there are 30 commits from the branch `jdk:master`that can **not** be merged into the branch `master`:
The following file contains merge conflicts:
All Committers in this [project](https://openjdk.java.net/census#lanai) have access to my [personal fork](https://github.com/openjdk-bot/lanai) 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/lanai](https://github.com/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 +7:openjdk-bot-7
$ git checkout openjdk-bot-7
# 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-7:7
_Note_: if you are using SSH to push commits to GitHub, then change the URL in the above `git push` command accordingly.
- 8259794: Remove EA from JDK 16 version string starting with Initial RC promotion on Feb 04, 2021(B35)
- 8260704: ParallelGC: oldgen expansion needs release-store for _end
- 8260927: StringBuilder::insert is incorrect without Compact Strings
- 8258378: Final nroff manpage update for JDK 16
- 8257215: JFR: Events dropped when streaming over a chunk rotation
- 8260473: [vector] ZGC: VectorReshape test produces incorrect results with ZGC enabled
- 8260632: Build failures after JDK-8253353
- 8260339: JVM crashes when executing PhaseIdealLoop::match_fill_loop
- 8260608: add a regression test for 8260370
- ... and 20 more: https://git.openjdk.java.net/lanai/compare/a47befc8...9b7a8f19
The webrev contains the conflicts with master:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=lanai&pr=172&range=00.conflicts
Stats: 5673 lines in 180 files changed: 3963 ins; 1149 del; 561 mod
Fetch: git fetch https://git.openjdk.java.net/lanai pull/172/head:pull/172
More information about the lanai-dev