hg: jdk/sandbox: Merge

magnus.ihse.bursie at oracle.com magnus.ihse.bursie at oracle.com
Fri Jun 15 12:58:21 UTC 2018


Changeset: d02da43d8b98
Author:    ihse
Date:      2018-06-15 14:58 +0200
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/d02da43d8b98

Merge

! make/launcher/Launcher-jdk.pack.gmk
! make/lib/CoreLibraries.gmk
- src/hotspot/share/gc/g1/g1StringDedupTable.cpp
- src/hotspot/share/gc/g1/g1StringDedupTable.hpp
- src/hotspot/share/gc/g1/g1StringDedupThread.cpp
- src/hotspot/share/gc/g1/g1StringDedupThread.hpp
! src/java.base/windows/native/libjava/io_util_md.c
! src/java.base/windows/native/libjava/io_util_md.h
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-1.12.4.js
- test/hotspot/jtreg/runtime/containers/docker/CPUSetsReader.java
- test/hotspot/jtreg/runtime/containers/docker/Common.java
- test/hotspot/jtreg/serviceability/tmtools/jstat/utils/ClassLoadUtils.java
- test/hotspot/jtreg/serviceability/tmtools/jstat/utils/GeneratingClassLoader.java
- test/hotspot/jtreg/serviceability/tmtools/jstat/utils/TemplateClass.java
- test/hotspot/jtreg/vmTestbase/heapdump/JMapHeap/TEST.properties
- test/hotspot/jtreg/vmTestbase/heapdump/JMapHeap/TestDescription.java
- test/hotspot/jtreg/vmTestbase/heapdump/JMapHeap/run.sh
- test/hotspot/jtreg/vmTestbase/heapdump/JMapHeapCore/TestDescription.java
- test/hotspot/jtreg/vmTestbase/heapdump/JMapHeapCore/run.sh
- test/hotspot/jtreg/vmTestbase/heapdump/JMapMetaspace/TEST.properties
- test/hotspot/jtreg/vmTestbase/heapdump/JMapMetaspace/TestDescription.java
- test/hotspot/jtreg/vmTestbase/heapdump/JMapMetaspace/run.sh
- test/hotspot/jtreg/vmTestbase/heapdump/JMapMetaspaceCore/TEST.properties
- test/hotspot/jtreg/vmTestbase/heapdump/JMapMetaspaceCore/TestDescription.java
- test/hotspot/jtreg/vmTestbase/heapdump/JMapMetaspaceCore/run.sh
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToFile/TEST.properties
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToFile/TestDescription.java
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToFile/run.sh
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToFileMetaspace/TEST.properties
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToFileMetaspace/TestDescription.java
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToFileMetaspace/run.sh
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToPath/TEST.properties
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToPath/TestDescription.java
- test/hotspot/jtreg/vmTestbase/heapdump/OnOOMToPath/run.sh
- test/hotspot/jtreg/vmTestbase/heapdump/README
- test/hotspot/jtreg/vmTestbase/heapdump/share/EatMemory.java
- test/hotspot/jtreg/vmTestbase/heapdump/share/common.sh
- test/jdk/java/lang/Thread/StopThrowable.java
- test/jdk/java/util/Formatter/NoGroupingUsed.java
- test/jdk/sun/text/resources/JavaTimeSupplementaryTest.java



More information about the jdk-sandbox-changes mailing list