[lambda-leftovers] RFR: Merge master
J.Duke
duke at openjdk.java.net
Fri Jul 31 18:40:57 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:
- src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.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 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 +58:openjdk-bot-58
$ git checkout openjdk-bot-58
# 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-58:58
_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:
- 8250889: Disable testing SendReceiveMaxSize with preferIPv4Stack=true on the old impl until JDK-8250886 is fixed
- 8250629: do not allow C-style array declaration in record components
- 8233048: WeekFields.ISO is not a singleton
- 8250741: an annotation interface may not be declared as a local interface
- 8242885: PlainDatagramSocketImpl doesn’t allow for the sending of IPv6 datagrams on macOS with sizes between 65508-65527 bytes
- 8246164: SendDatagramToBadAddress.java and ChangingAddress.java should be changed to explicitly require the new DatagramSocket implementation
- 8241518: Member signature parameter span contains closing but not opening parens
- 6501010: test/java/io/File/GetXSpace.java fails on Windows
- 8250863: Build error with GCC 10 in NetworkInterface.c and k_standard.c
- 8249772: (ch) Improve sun/nio/ch/TestMaxCachedBufferSize.java
The webrev contains the conflicts with lambda-leftovers:
- merge conflicts: https://webrevs.openjdk.java.net/amber/36/webrev.00.conflicts
Changes: https://git.openjdk.java.net/amber/pull/36/files
Stats: 779 lines in 35 files changed: 386 ins; 218 del; 175 mod
Patch: https://git.openjdk.java.net/amber/pull/36.diff
Fetch: git fetch https://git.openjdk.java.net/amber pull/36/head:pull/36
PR: https://git.openjdk.java.net/amber/pull/36
More information about the amber-dev
mailing list