[records-2] RFR: Merge master
J.Duke
duke at openjdk.java.net
Thu Sep 24 22:11:32 UTC 2020
Hi all,
this is an _automatically_ generated pull request to notify you that there are 86 commits from the branch `master`that
can **not** be merged into the branch `records-2`:
The following file contains merge conflicts:
- test/hotspot/jtreg/runtime/records/RedefineRecord.java
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 +63:openjdk-bot-63
$ git checkout openjdk-bot-63
# 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-63:63
_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:
- 8251261: CDS dumping should not clear states in live classes
- 8251999: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/aod
- 8252722: More Swing plaf APIs that rely on default constructors
- 8250855: Address reliance on default constructors in the Java 2D APIs
- 8250859: Address reliance on default constructors in the Accessibility APIs
- 8253500: [REDO] JDK-8253208 Move CDS related code to a separate class
- 8253539: Remove unused JavaThread functions for set_last_Java_fp/pc
- 8253583: java/util/StringJoiner tests failing on 32-bit VMs after JDK-8246697
- 8253524: C2: Refactor code that clones predicates during loop unswitching
- 8253581: runtime/stringtable/StringTableCleaningTest.java fails on 32-bit platforms
- ... and 76 more: https://git.openjdk.java.net/amber/compare/6c3e483b...8b85c3a6
The webrev contains the conflicts with records-2:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=amber&pr=55&range=00.conflicts
Changes: https://git.openjdk.java.net/amber/pull/55/files
Stats: 10355 lines in 570 files changed: 5236 ins; 3597 del; 1522 mod
Patch: https://git.openjdk.java.net/amber/pull/55.diff
Fetch: git fetch https://git.openjdk.java.net/amber pull/55/head:pull/55
PR: https://git.openjdk.java.net/amber/pull/55
More information about the amber-dev
mailing list