hg: panama/dev: Automatic merge with default
maurizio.cimadamore at oracle.com
maurizio.cimadamore at oracle.com
Wed Feb 13 21:09:55 UTC 2019
Changeset: 5b5135f622ee
Author: mcimadamore
Date: 2019-02-13 22:09 +0100
URL: http://hg.openjdk.java.net/panama/dev/rev/5b5135f622ee
Automatic merge with default
! make/CompileJavaModules.gmk
! src/hotspot/share/classfile/systemDictionary.cpp
! src/hotspot/share/classfile/systemDictionary.hpp
- src/hotspot/share/code/relocInfo_ext.cpp
- src/hotspot/share/code/relocInfo_ext.hpp
- src/hotspot/share/gc/g1/collectionSetChooser.cpp
- src/hotspot/share/gc/g1/collectionSetChooser.hpp
! src/hotspot/share/opto/graphKit.cpp
! src/hotspot/share/opto/graphKit.hpp
! src/hotspot/share/prims/methodHandles.cpp
- src/java.desktop/windows/native/libawt/windows/awt_Robot.h
- test/hotspot/jtreg/serviceability/dcmd/framework/TEST.properties
- test/jdk/sun/security/krb5/auto/rcache_usemd5.sh
- test/jdk/sun/security/krb5/tools/ktarg.sh
- test/jdk/sun/security/krb5/tools/ktcheck.sh
- test/jdk/sun/security/krb5/tools/ktmissing.sh
- test/jdk/sun/security/krb5/tools/ktzero.sh
- test/jdk/sun/security/pkcs11/fips/CipherTest.java
- test/jdk/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java
- test/jdk/sun/security/pkcs11/fips/ImportKeyStore.java
- test/jdk/sun/security/pkcs11/fips/JSSEClient.java
- test/jdk/sun/security/pkcs11/fips/JSSEServer.java
- test/jdk/sun/security/pkcs11/fips/TestTLS12.java
- test/jdk/sun/security/pkcs11/fips/TrustManagerTest.java
- test/jdk/sun/security/pkcs11/fips/TrustManagerTest.policy
- test/jdk/sun/security/pkcs11/fips/cert8.db
- test/jdk/sun/security/pkcs11/fips/certs/anchor.cer
- test/jdk/sun/security/pkcs11/fips/certs/ca.cer
- test/jdk/sun/security/pkcs11/fips/certs/server.cer
- test/jdk/sun/security/pkcs11/fips/fips.cfg
- test/jdk/sun/security/pkcs11/fips/key3.db
- test/jdk/sun/security/pkcs11/fips/keystore
- test/jdk/sun/security/pkcs11/fips/secmod.db
- test/jdk/sun/security/pkcs11/fips/truststore
More information about the panama-dev
mailing list