[lworld] FYI: Merge jdk

David Simms dsimms at openjdk.java.net
Mon Jun 8 15:27:47 UTC 2020


Merge tag 'jdk-15+22' into lworld_merge_jdk_15_22
Added tag jdk-15+22 for changeset 7223c6d61034

# Conflicts:
#	src/hotspot/share/oops/instanceKlass.cpp
#	src/hotspot/share/oops/objArrayKlass.cpp
#	src/hotspot/share/oops/objArrayKlass.hpp
#	src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java

-------------

Commit messages:
 - Merge tag 'jdk-15+22' into lworld_merge_jdk_15_22
 - 8236177: assert(status == 0) failed: error ETIMEDOUT(60), cond_wait
 - 8237777: "Dumping core ..." is shown despite claiming that "# No core dump will be written."
 - 8244459: Optimize the hash map size in LocaleProviderAdapters
 - 8240666: Websocket client’s OpeningHandshake discards the HTTP response body
 - 8244491: make runtime/cds/appcds/TestZGCWithCDS.java test more robust
 - 8241602: jlink does not produce reproducible jimage files
 - 8244413: Avoid rebinds in MethodHandle.viewAsType
 - 8244196: adjust output in os_linux
 - 8244463: JFR: Clean up jdk.jfr.internal.RepositoryChunk
 - ... and 98 more: https://git.openjdk.java.net/valhalla/compare/6aa1293d...51dccbfd

The webrevs contain the adjustments done while merging with regards to each parent branch:
 - lworld: https://webrevs.openjdk.java.net/valhalla/67/webrev.00.0
 - jdk: https://webrevs.openjdk.java.net/valhalla/67/webrev.00.1

Changes: https://git.openjdk.java.net/valhalla/pull/67/files
  Stats: 44359 lines in 1179 files changed: 8472 ins; 26878 del; 9009 mod
  Patch: https://git.openjdk.java.net/valhalla/pull/67.diff
  Fetch: git fetch https://git.openjdk.java.net/valhalla pull/67/head:pull/67

PR: https://git.openjdk.java.net/valhalla/pull/67


More information about the valhalla-dev mailing list