[lworld] Integrated: Merge jdk
David Simms
dsimms at openjdk.java.net
Thu Sep 3 09:27:31 UTC 2020
On Thu, 3 Sep 2020 09:18:17 GMT, David Simms <dsimms at openjdk.org> wrote:
> Merge tag 'jdk-16+12' into lworld_merge_jdk_16_12
> Added tag jdk-16+12 for changeset fc8e62b399bd
>
> # Conflicts:
> # src/hotspot/share/memory/dynamicArchive.cpp
> # src/hotspot/share/memory/heapInspection.cpp
> # src/hotspot/share/memory/metaspaceClosure.hpp
> # src/hotspot/share/memory/metaspaceShared.cpp
> # src/hotspot/share/oops/markWord.hpp
> # src/hotspot/share/opto/memnode.cpp
This pull request has now been integrated.
Changeset: 321ea1de
Author: David Simms <dsimms at openjdk.org>
URL: https://git.openjdk.java.net/valhalla/commit/321ea1de
Stats: 9834 lines in 338 files changed: 2225 ins; 5188 del; 2421 mod
Merge jdk
Merge tag 'jdk-16+12'
-------------
PR: https://git.openjdk.java.net/valhalla/pull/176
More information about the valhalla-dev
mailing list