hg: panama/dev: Manual merge with default

vladimir.x.ivanov at oracle.com vladimir.x.ivanov at oracle.com
Fri Dec 21 19:36:01 UTC 2018


Changeset: 7a1fa4b0fd07
Author:    vlivanov
Date:      2018-12-21 11:35 -0800
URL:       http://hg.openjdk.java.net/panama/dev/rev/7a1fa4b0fd07

Manual merge with default

! src/hotspot/cpu/aarch64/aarch64.ad
! src/hotspot/cpu/aarch64/assembler_aarch64.hpp
! src/hotspot/cpu/arm/arm.ad
! src/hotspot/cpu/ppc/ppc.ad
! src/hotspot/cpu/x86/assembler_x86.cpp
! src/hotspot/cpu/x86/assembler_x86.hpp
! src/hotspot/cpu/x86/vm_version_x86.cpp
! src/hotspot/cpu/x86/vm_version_x86.hpp
! src/hotspot/cpu/x86/x86.ad
! src/hotspot/cpu/x86/x86_32.ad
! src/hotspot/cpu/x86/x86_64.ad
! src/hotspot/share/adlc/formssel.cpp
! src/hotspot/share/classfile/vmSymbols.hpp
- src/hotspot/share/jfr/recorder/repository/jfrChunkSizeNotifier.cpp
- src/hotspot/share/jfr/recorder/repository/jfrChunkSizeNotifier.hpp
! src/hotspot/share/opto/addnode.hpp
! src/hotspot/share/opto/c2compiler.cpp
! src/hotspot/share/opto/classes.hpp
! src/hotspot/share/opto/compile.cpp
! src/hotspot/share/opto/library_call.cpp
! src/hotspot/share/opto/matcher.cpp
! src/hotspot/share/opto/superword.cpp
! src/hotspot/share/opto/type.cpp
! src/hotspot/share/opto/type.hpp
! src/hotspot/share/opto/vectornode.cpp
! src/hotspot/share/opto/vectornode.hpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/vmStructs.cpp
- src/java.base/share/classes/com/sun/crypto/provider/HmacPKCS12PBESHA1.java
- src/java.logging/share/classes/java/util/logging/package.html
- src/java.prefs/share/classes/java/util/prefs/package.html
- src/java.rmi/share/classes/java/rmi/activation/package.html
- src/java.rmi/share/classes/java/rmi/dgc/package.html
- src/java.rmi/share/classes/java/rmi/package.html
- src/java.rmi/share/classes/java/rmi/registry/package.html
- src/java.rmi/share/classes/java/rmi/server/package.html
- src/java.rmi/share/classes/javax/rmi/ssl/package.html
- src/java.security.jgss/share/classes/org/ietf/jgss/package.html
- src/java.smartcardio/share/classes/javax/smartcardio/package.html
- src/java.sql.rowset/share/classes/com/sun/rowset/package.html
- src/java.sql.rowset/share/classes/com/sun/rowset/providers/package.html
- src/java.sql.rowset/share/classes/javax/sql/rowset/serial/package.html
- src/java.sql/share/classes/java/sql/package.html
- src/java.sql/share/classes/javax/sql/package.html
- src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/Key.java
- src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/KeyStore.java
- src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSACipher.java
- src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAKeyPair.java
- src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java
- src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAPrivateKey.java
- src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAPublicKey.java
- src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSASignature.java
- test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorEventsForTwoThreadsTest.java
- test/jdk/java/net/MulticastSocket/PromiscuousIPv6.java
- test/jdk/java/nio/channels/DatagramChannel/PromiscuousIPv6.java



More information about the panama-dev mailing list