[patterns-stage-2] RFR: Merge master
J.Duke
duke at openjdk.java.net
Fri Sep 18 13:27:40 UTC 2020
Hi all,
this is an _automatically_ generated pull request to notify you that there are 76 commits from the branch `master`that
can **not** be merged into the branch `patterns-stage-2`:
The following file contains merge conflicts:
- .jcheck/conf
All Committers in this [project](https://openjdk.java.net/census#Optional[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 patterns-stage-2
$ git pull https://github.com/openjdk/amber patterns-stage-2
# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/amber +66:openjdk-bot-66
$ git checkout openjdk-bot-66
# Merge the target branch
$ git merge patterns-stage-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 openjdk-bot-66:66
_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:
- 8253313: xmlstream.hpp missing from vmIntrinsics.cpp
- 8253271: vm_version_x86.hpp should not include globals_extension.hpp
- 8243066: Move VM_INTRINSICS_DO into its own vmIntrinsics.hpp file
- 8253262: Allocate in DumpRegion is not thread safe
- 8252041: G1: Fix incorrect uses of HeapRegionManager::max_length
- 8253285: Some java/util/StringJoiner tests do not explicitly specify required -XX:+CompactStrings
- 8251397: NPE on ClassValue.ClassValueMap.cacheArray
- 8252996: Thread safety problem in java.net.ProxySelector
- 8252593: [TESTBUG] serviceability/jvmti/GetLocalVariable/GetLocalWithoutSuspendTest.java failed with JVMTI_ERROR_INVALID_SLOT
- 8253050: jfr disassemble command processes --max-chunks incorrectly
- ... and 66 more: https://git.openjdk.java.net/amber/compare/48802268...6c3e483b
The webrev contains the conflicts with patterns-stage-2:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=amber&pr=54&range=00.conflicts
Changes: https://git.openjdk.java.net/amber/pull/54/files
Stats: 18125 lines in 428 files changed: 9356 ins; 6605 del; 2164 mod
Patch: https://git.openjdk.java.net/amber/pull/54.diff
Fetch: git fetch https://git.openjdk.java.net/amber pull/54/head:pull/54
PR: https://git.openjdk.java.net/amber/pull/54
More information about the amber-dev
mailing list