[lambda-leftovers] RFR: Merge master
J.Duke
duke at openjdk.java.net
Fri Sep 11 08:12:40 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 `lambda-leftovers`:
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 lambda-leftovers
$ git pull https://github.com/openjdk/amber lambda-leftovers
# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/amber +63:openjdk-bot-63
$ git checkout openjdk-bot-63
# Merge the target branch
$ git merge lambda-leftovers
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-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:
- Resolving whitespace problem.
- Merge master
- 8171303: sun/java2d/pipe/InterpolationQualityTest.java fails on Windows & Linux
- 7183828: Invalid Image Variant when using anything other than BufferedImage
- 8252817: Cleanup the classes in the java.awt.color package
- 8252919: JDK built with --enable-cds=no fails with NoClassDefFoundError
- 8252830: Correct missing javadoc comments in java.rmi module
- 8252774: remove jdk.test.lib.FileInstaller action from graalunit tests
- 8252778: remove jdk.test.lib.FileInstaller action from compiler/c2/stemmer test
- 8247928: Refactor G1ConcurrentMarkThread for mark abort
- ... and 48 more: https://git.openjdk.java.net/amber/compare/bb202a22...add08282
The webrevs contain the adjustments done while merging with regards to each parent branch:
- lambda-leftovers: https://webrevs.openjdk.java.net/?repo=amber&pr=41&range=00.0
- master: https://webrevs.openjdk.java.net/?repo=amber&pr=41&range=00.1
Changes: https://git.openjdk.java.net/amber/pull/41/files
Stats: 8852 lines in 336 files changed: 6324 ins; 1248 del; 1280 mod
Patch: https://git.openjdk.java.net/amber/pull/41.diff
Fetch: git fetch https://git.openjdk.java.net/amber pull/41/head:pull/41
PR: https://git.openjdk.java.net/amber/pull/41
More information about the amber-dev
mailing list