[lambda-leftovers] RFR: Merge master [v2]
J.Duke
duke at openjdk.java.net
Thu Jan 14 22:05:23 UTC 2021
> 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
J. Duke has updated the pull request incrementally with 207 additional commits since the last revision:
- 8259350: Add some internal debugging APIs to the debug agent
Reviewed-by: sspitsyn, amenkov
- 8259278: Optimize Vector API slice and unslice operations
Reviewed-by: psandoz, vlivanov
- 8255019: Shenandoah: Split STW and concurrent mark into separate classes
Reviewed-by: rkennke, shade
- 8258956: Memory Leak in StringCoding on ThreadLocal resultCached StringCoding.Result
Reviewed-by: rriggs, alanb
- 8253866: Security Libs Terminology Refresh
Reviewed-by: erikj, weijun, mullan
- 8259727: Remove redundant "target" arguments to methods in Links
Reviewed-by: hannesw
- 8259723: Move Table class to formats.html package
Reviewed-by: hannesw
- 8258912: Remove JVM options CountJNICalls and CountJVMCalls
Reviewed-by: coleenp, lfoltan, shade
- 8226416: MonitorUsedDeflationThreshold can cause repeated async deflation requests
Reviewed-by: dholmes, coleenp
- 8259699: Reduce char[] copying in URLEncoder.encode(String, Charset)
Reviewed-by: attila, redestad, chegar
- ... and 197 more: https://git.openjdk.java.net/amber/compare/f5ee3565...d18d26e8
-------------
Changes:
- all: https://git.openjdk.java.net/amber/pull/75/files
- new: https://git.openjdk.java.net/amber/pull/75/files/f5ee3565..d18d26e8
Webrevs:
- full: https://webrevs.openjdk.java.net/?repo=amber&pr=75&range=01
- incr: https://webrevs.openjdk.java.net/?repo=amber&pr=75&range=00-01
Stats: 40134 lines in 1211 files changed: 16015 ins; 11783 del; 12336 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