[concise-method-declarations] RFR: Merge master

J.Duke duke at openjdk.java.net
Thu Jun 11 22:14:47 UTC 2020


Hi all,

this is an _automatically_ generated pull request to notify you that there are 152 commits from the branch `master`that
can **not** be merged into the branch `concise-method-declarations`:

The following file contains merge conflicts:

- src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.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 concise-method-declarations
$ git pull https://github.com/openjdk/amber concise-method-declarations

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

# Merge the target branch
$ git merge concise-method-declarations

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-53:53

_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:
 - 8244965: Incorrect error message in vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001/TestDescription.java
 - 8246803: Update link to license in Docs.gmk
 - 8235496: Start of release updates for JDK 16
 - Merge
 - 8247247: JFR tests fail due to JDK-8235521 missing doPrivileged block
 - 8207936: TestZipFile.java can fail with an OOM error
 - 8246031: SSLSocket.getSession() doesn't close connection for timeout/ interrupts
 - 8247367: Shenandoah: pacer should wait on lock instead of exponential backoff
 - 8247358: Shenandoah: reconsider free budget slice for marking
 - Added tag jdk-16+0 for changeset 93813843680b
 - ... and 142 more: https://git.openjdk.java.net/amber/compare/1b590970...6341f8c0

The webrev contains the conflicts with concise-method-declarations:
 - merge conflicts: https://webrevs.openjdk.java.net/amber/31/webrev.00.conflicts

Changes: https://git.openjdk.java.net/amber/pull/31/files
  Stats: 73267 lines in 1969 files changed: 45127 ins; 21412 del; 6728 mod
  Patch: https://git.openjdk.java.net/amber/pull/31.diff
  Fetch: git fetch https://git.openjdk.java.net/amber pull/31/head:pull/31

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


More information about the amber-dev mailing list