hg: panama/dev: Manual merge with default
jorn.vernee at oracle.com
jorn.vernee at oracle.com
Thu Jan 23 11:31:01 UTC 2020
Changeset: a9aa3db71b6c
Author: jvernee
Date: 2020-01-23 11:55 +0100
URL: https://hg.openjdk.java.net/panama/dev/rev/a9aa3db71b6c
Manual merge with default
! make/CompileJavaModules.gmk
- src/hotspot/os/bsd/gc/z/zBackingFile_bsd.cpp
- src/hotspot/os/bsd/gc/z/zBackingFile_bsd.hpp
- src/hotspot/os/linux/gc/z/zBackingFile_linux.cpp
- src/hotspot/os/linux/gc/z/zBackingFile_linux.hpp
- src/hotspot/os/linux/gc/z/zBackingPath_linux.cpp
- src/hotspot/os/linux/gc/z/zBackingPath_linux.hpp
- src/hotspot/os/windows/gc/z/zBackingFile_windows.cpp
- src/hotspot/os/windows/gc/z/zBackingFile_windows.hpp
- src/hotspot/share/gc/parallel/psMarkSweep.cpp
- src/hotspot/share/gc/parallel/psMarkSweep.hpp
- src/hotspot/share/gc/parallel/psMarkSweepDecorator.cpp
- src/hotspot/share/gc/parallel/psMarkSweepDecorator.hpp
- src/hotspot/share/gc/parallel/psMarkSweepProxy.hpp
! src/java.base/share/classes/java/lang/ClassLoader.java
! src/java.base/share/classes/java/lang/System.java
- src/java.base/share/classes/java/time/chrono/hijrah-config-islamic-umalqura.properties
- test/hotspot/jtreg/runtime/records/TEST.properties
- test/jdk/java/io/Serializable/records/TEST.properties
- test/jdk/java/lang/instrument/TEST.properties
- test/jdk/java/lang/reflect/records/TEST.properties
- test/jdk/java/lang/runtime/TEST.properties
- test/jdk/sun/security/krb5/auto/SaslGSS.java
More information about the panama-dev
mailing list