[enhanced-enums] RFR: Merge master [v2]
J.Duke
duke at openjdk.java.net
Fri Sep 11 08:13:31 UTC 2020
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 56 commits from the branch `master`that
> can **not** be merged into the branch `enhanced-enums`:
> 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
> enhanced-enums $ git pull https://github.com/openjdk/amber enhanced-enums
>
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/amber +64:openjdk-bot-64
> $ git checkout openjdk-bot-64
>
> # Merge the target branch
> $ git merge enhanced-enums
>
> 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-64:64
>
> _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
57 commits:
- Merge master
- 8171303: sun/java2d/pipe/InterpolationQualityTest.java fails on Windows & Linux
Reviewed-by: prr, psadhukhan, kcr
- 7183828: Invalid Image Variant when using anything other than BufferedImage
Reviewed-by: prr
- 8252817: Cleanup the classes in the java.awt.color package
Reviewed-by: jdv, pbansal
- 8252919: JDK built with --enable-cds=no fails with NoClassDefFoundError
Reviewed-by: minqi, sundar, alanb, redestad
- 8252830: Correct missing javadoc comments in java.rmi module
Reviewed-by: dfuchs, lancea, smarks, chegar
- 8252774: remove jdk.test.lib.FileInstaller action from graalunit tests
Reviewed-by: shade, epavlova
- 8252778: remove jdk.test.lib.FileInstaller action from compiler/c2/stemmer test
Reviewed-by: shade, epavlova
- 8247928: Refactor G1ConcurrentMarkThread for mark abort
Reviewed-by: sjohanss, kbarrett
- 8252846: Fix ppc/s390 after "8231441: AArch64: Initial SVE backend su…
Reviewed-by: shade
- ... and 47 more: https://git.openjdk.java.net/amber/compare/6b3eb090...a0ac6d6f
-------------
Changes: https://git.openjdk.java.net/amber/pull/42/files
Webrev: https://webrevs.openjdk.java.net/?repo=amber&pr=42&range=01
Stats: 8849 lines in 336 files changed: 6324 ins; 1248 del; 1277 mod
Patch: https://git.openjdk.java.net/amber/pull/42.diff
Fetch: git fetch https://git.openjdk.java.net/amber pull/42/head:pull/42
PR: https://git.openjdk.java.net/amber/pull/42
More information about the amber-dev
mailing list