[lambda-leftovers] RFR: Merge master

J.Duke duke at openjdk.java.net
Thu Dec 31 22:07:21 UTC 2020


Hi all,

this is an _automatically_ generated pull request to notify you that there are 10 commits from the branch `master`that can **not** be merged into the branch `lambda-leftovers`:

The following file contains merge conflicts:

- test/langtools/tools/javac/lambda/UnderscoreAsIdent.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 lambda-leftovers
$ git pull https://github.com/openjdk/amber.git lambda-leftovers

# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/amber.git +78:openjdk-bot-78
$ git checkout openjdk-bot-78

# 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.git openjdk-bot-78:78

_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:
 - 8179503: Java should support GET OCSP calls
 - 8258525: Some existing tests should use /nodynamiccopyright/ instead of the standard header
 - Merge
 - 8258662: JDK 17ea: Crash compiling instanceof check involving sealed interface
 - 8245922: [macos] Taskbar.Feature.ICON_BADGE_NUMBER no longer supported on MacOS
 - 8251377: [macos11] JTabbedPane selected tab text is barely legible
 - 8258941: Test specify the Classpath exception in the header
 - 8257147: [TESTBUG] Set a larger default loop count for the VectorAPI jtreg tests
 - 8216400: improve handling of IOExceptions in JavaCompiler.close()
 - 8258914: javax/net/ssl/DTLS/RespondToRetransmit.java timed out

The webrev contains the conflicts with lambda-leftovers:
 - merge conflicts: https://webrevs.openjdk.java.net/?repo=amber&pr=75&range=00.conflicts

Changes: https://git.openjdk.java.net/amber/pull/75/files
  Stats: 4121 lines in 349 files changed: 601 ins; 2880 del; 640 mod
  Patch: https://git.openjdk.java.net/amber/pull/75.diff
  Fetch: git fetch https://git.openjdk.java.net/amber pull/75/head:pull/75

PR: https://git.openjdk.java.net/amber/pull/75


More information about the amber-dev mailing list