[sealed-types] [Rev 01] RFR: Merge master
J.Duke
duke at openjdk.java.net
Fri May 29 14:34:07 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 `sealed-types`:
> The following files contains merge conflicts:
>
> - make/data/jdwp/jdwp.spec
> - src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java
> - src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java
> - src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java
>
> 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
> sealed-types $ git pull https://github.com/openjdk/amber sealed-types
>
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/amber +42:openjdk-bot-42
> $ git checkout openjdk-bot-42
>
> # Merge the target branch
> $ git merge sealed-types
>
> 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-42:42
>
> _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
J. Duke has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains
87 commits:
- manual merge with master
- Added tag jdk-15+25 for changeset 90b266a84c06
- 8244703: "platform encoding not initialized" exceptions with debugger, JNI
Reviewed-by: alanb, sspitsyn
- 8245505: Prelink j.l.ref.Reference when loading AOT library
Reviewed-by: dlong, kvn
- 8245478: Implementation: JEP 379: Shenandoah: A Low-Pause-Time Garbage Collector (Production)
Reviewed-by: rkennke, smonteith, zgu
- 8245942: Shenandoah: x86_32 builds fail after JDK-8245594
Reviewed-by: zgu
- 8246023: Obsolete LIRFillDelaySlot
Reviewed-by: thartmann, kvn
- 8245718: Epsilon: improve configuration logging
Reviewed-by: rkennke
- 8245864: Obsolete BranchOnRegister
Reviewed-by: thartmann, kvn
- 8245955: Shenandoah: Remove LRB/is_redundant optimization
Reviewed-by: roland, shade
- ... and 77 more: https://git.openjdk.java.net/amber/compare/926ea22b...71add502
-------------
Changes: https://git.openjdk.java.net/amber/pull/22/files
Webrev: https://webrevs.openjdk.java.net/amber/22/webrev.01
Stats: 93975 lines in 493 files changed: 26316 ins; 65743 del; 1916 mod
Patch: https://git.openjdk.java.net/amber/pull/22.diff
Fetch: git fetch https://git.openjdk.java.net/amber pull/22/head:pull/22
PR: https://git.openjdk.java.net/amber/pull/22
More information about the amber-dev
mailing list