[sealed-types] Merge master
J.Duke
duke at openjdk.java.net
Thu Apr 23 22:08:41 UTC 2020
Hi all,
this is an _automatically_ generated pull request to notify you that there are 93 commits from the branch `master`that
can **not** be merged into the branch `sealed-types`:
The following files contains merge conflicts:
- src/hotspot/share/oops/instanceKlass.hpp
- src/java.base/share/classes/java/lang/Class.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 sealed-types
$ git pull https://github.com/openjdk/amber sealed-types
# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/amber +40:openjdk-bot-40
$ git checkout openjdk-bot-40
# Merge the target branch
$ git merge sealed-types
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-40:40
_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:
- 8242302: Refactor jpackage native code
- 8238048: Close alignment gaps in InstanceKlass
- 8243494: Shenandoah: set counters once per cycle
- 8243486: ZGC: Adjust "Allocated" statistics to take undone page allocations into account
- 8239357: Revert gcc implementation of offset_of
- 8243487: Shenandoah: make _num_phases illegal phase type
- 8243478: Shenandoah: avoid implicit worker_id = 0
- 8242792: interval < flushInterval is always false in jdk.jfr.internal.RequestEngine#setFlushInterval
- 8241603: ZGC: java/lang/management/MemoryMXBean/MemoryTestZGC.sh crashes on macOS
- 8242848: Improve performance of InflaterOutputStream.write()
- ...omitting 83 further commits.
The merge commit only contains trivial merges, so no merge-specific webrevs have been generated.
Changes: https://git.openjdk.java.net/amber/pull/18/files
Stats: 43341 lines in 767 files changed: 22271 ins; 17289 del; 3781 mod
Patch: https://git.openjdk.java.net/amber/pull/18.diff
Fetch: git fetch https://git.openjdk.java.net/amber pull/18/head:pull/18
PR: https://git.openjdk.java.net/amber/pull/18
More information about the amber-dev
mailing list