hg: panama/dev: Automatic merge with foreign

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Wed Feb 13 21:11:45 UTC 2019


Changeset: 1ea83b3d01cb
Author:    mcimadamore
Date:      2019-02-13 22:11 +0100
URL:       http://hg.openjdk.java.net/panama/dev/rev/1ea83b3d01cb

Automatic merge with foreign

! make/common/Modules.gmk
! make/common/NativeCompilation.gmk
! src/hotspot/cpu/arm/arm.ad
- 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/c2_globals.hpp
! src/hotspot/share/opto/escape.cpp
! src/hotspot/share/opto/graphKit.cpp
! src/hotspot/share/opto/graphKit.hpp
! src/hotspot/share/runtime/globals.hpp
- 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